reserve returns nil when there is no job

Author: hone

lib/resque/worker.rb

@@ -199,16 +199,18 @@ def reserve(interval = 5.0)
         queues.map {|queue| Queue.new(queue, Resque.redis, Resque.coder) },
         Resque.redis)
 
-      if interval < 1
-        queue, job = multi_queue.pop(true)
+      queue, job = if interval < 1
+        begin
+          multi_queue.pop(true)
+        rescue ThreadError
+          nil
+        end
       else
         queue, job = multi_queue.poll(interval.to_i)
       end
 
       log! "Found job on #{queue}"
-      return Job.new(queue.name, job)
-    rescue ThreadError
-      nil
+      Job.new(queue.name, job) if queue && job
     end
 
     # Returns a list of queues to use when searching for a job.

test/worker_test.rb

@@ -272,6 +272,12 @@ def self.exception
     end
   end
 
+  it "reserve returns nil when there is no job and is polling" do
+    worker = Resque::Worker.new(:timeout)
+
+    assert_equal nil, worker.reserve(1)
+  end
+
   it "keeps track of how many failures it has seen" do
     Resque::Job.create(:jobs, BadJob)
     Resque::Job.create(:jobs, BadJob)