From 484d35e18b8710514bfd65b68605c6f35f2d17e4 Mon Sep 17 00:00:00 2001
From: Mike Perham <mperham@gmail.com>
Date: Thu, 15 Aug 2013 19:52:50 -0700
Subject: [PATCH] Fix race conditions in Web UI actions

---
 Changes.md             |  6 ++++++
 lib/sidekiq/version.rb |  2 +-
 lib/sidekiq/web.rb     | 30 ++++++++++++++++++------------
 3 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/Changes.md b/Changes.md
index 0cd79c9d..d760e0a6 100644
--- a/Changes.md
+++ b/Changes.md
@@ -1,3 +1,9 @@
+2.13.2
+-----------
+
+- Fix more race conditions in Web UI actions
+
+
 2.13.1
 -----------
 
diff --git a/lib/sidekiq/version.rb b/lib/sidekiq/version.rb
index 862bbec6..318430a8 100644
--- a/lib/sidekiq/version.rb
+++ b/lib/sidekiq/version.rb
@@ -1,3 +1,3 @@
 module Sidekiq
-  VERSION = "2.13.1"
+  VERSION = "2.13.2"
 end
diff --git a/lib/sidekiq/web.rb b/lib/sidekiq/web.rb
index 5effc2b6..fec01783 100644
--- a/lib/sidekiq/web.rb
+++ b/lib/sidekiq/web.rb
@@ -238,10 +238,12 @@ module Sidekiq
     post "/retries/:key" do
       halt 404 unless params['key']
       job = Sidekiq::RetrySet.new.fetch(*parse_params(params['key'])).first
-      if params['retry']
-        job.retry
-      elsif params['delete']
-        job.delete
+      if job
+        if params['retry']
+          job.retry
+        elsif params['delete']
+          job.delete
+        end
       end
       redirect "#{root_path}retries"
     end
@@ -265,10 +267,12 @@ module Sidekiq
 
       params['key'].each do |key|
         job = Sidekiq::ScheduledSet.new.fetch(*parse_params(key)).first
-        if params['delete']
-          job.delete
-        elsif params['add_to_queue']
-          job.add_to_queue
+        if job
+          if params['delete']
+            job.delete
+          elsif params['add_to_queue']
+            job.add_to_queue
+          end
         end
       end
       redirect "#{root_path}scheduled"
@@ -277,10 +281,12 @@ module Sidekiq
     post "/scheduled/:key" do
       halt 404 unless params['key']
       job = Sidekiq::ScheduledSet.new.fetch(*parse_params(params['key'])).first
-      if params['add_to_queue']
-        job.add_to_queue
-      elsif params['delete']
-        job.delete
+      if job
+        if params['add_to_queue']
+          job.add_to_queue
+        elsif params['delete']
+          job.delete
+        end
       end
       redirect "#{root_path}scheduled"
     end