From 13e79eb6c387f1af1551a53df1b5620e41c6da90 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Tue, 28 Jun 2011 10:51:23 -0700
Subject: lock_optimistically is typically true, so evaluate the common failure
 case first

---
 activerecord/lib/active_record/locking/optimistic.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/activerecord/lib/active_record/locking/optimistic.rb b/activerecord/lib/active_record/locking/optimistic.rb
index 3afa257a76..6cfce6e573 100644
--- a/activerecord/lib/active_record/locking/optimistic.rb
+++ b/activerecord/lib/active_record/locking/optimistic.rb
@@ -73,7 +73,7 @@ module ActiveRecord
           # <tt>locking_enabled?</tt> at this point as 
           # <tt>@attributes</tt> may not have been initialized yet.
 
-          if lock_optimistically && result.include?(self.class.locking_column)
+          if result.key?(self.class.locking_column) && lock_optimistically
             result[self.class.locking_column] ||= 0
           end
 
-- 
cgit v1.2.3