From ce102e3af9ccdb5015e20ab7155d2a13c7832a9a Mon Sep 17 00:00:00 2001 From: Rick Olson Date: Sat, 15 Dec 2007 01:45:30 +0000 Subject: Ensure optimistic locking handles nil #lock_version values properly. Closes #10510 [rick] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8395 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- activerecord/lib/active_record/locking/optimistic.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'activerecord/lib') diff --git a/activerecord/lib/active_record/locking/optimistic.rb b/activerecord/lib/active_record/locking/optimistic.rb index ecd6a2b258..799309c17b 100644 --- a/activerecord/lib/active_record/locking/optimistic.rb +++ b/activerecord/lib/active_record/locking/optimistic.rb @@ -70,7 +70,7 @@ module ActiveRecord return update_without_lock unless locking_enabled? lock_col = self.class.locking_column - previous_value = send(lock_col) + previous_value = send(lock_col).to_i send(lock_col + '=', previous_value + 1) begin -- cgit v1.2.3