From f5a4c94b7088f01bda6484c9c0c80e668cf307d2 Mon Sep 17 00:00:00 2001 From: Arvid Andersson Date: Thu, 19 Jan 2012 13:54:03 +0100 Subject: [PATCH] Ensure result before trying to use it as a Hash --- lib/delayed/backend/mongo_mapper.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/delayed/backend/mongo_mapper.rb b/lib/delayed/backend/mongo_mapper.rb index cafad14..9757373 100755 --- a/lib/delayed/backend/mongo_mapper.rb +++ b/lib/delayed/backend/mongo_mapper.rb @@ -68,7 +68,9 @@ def self.reserve(worker, max_run_time = Worker.max_run_time) # Return result as a MongoMapper document. # When MongoMapper starts supporting findAndModify, this extra step should no longer be necessary. - self.first :conditions => {:_id => result["_id"]} + if result + self.first :conditions => {:_id => result["_id"]} + end rescue Mongo::OperationFailure nil # no jobs available end