diff options
| author | Rick Olson <technoweenie@gmail.com> | 2007-12-15 01:45:30 +0000 |
|---|---|---|
| committer | Rick Olson <technoweenie@gmail.com> | 2007-12-15 01:45:30 +0000 |
| commit | ce102e3af9ccdb5015e20ab7155d2a13c7832a9a (patch) | |
| tree | e40fb1bf975de3acb64a7d2ffd37a330f2250e7a /activerecord/lib/active_record | |
| parent | abd7cf343c3f43516d25e3b787e96af38d12ebf4 (diff) | |
| download | rails-ce102e3af9ccdb5015e20ab7155d2a13c7832a9a.tar.gz rails-ce102e3af9ccdb5015e20ab7155d2a13c7832a9a.tar.bz2 rails-ce102e3af9ccdb5015e20ab7155d2a13c7832a9a.zip | |
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
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/locking/optimistic.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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 |