diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2010-11-17 11:32:31 +0000 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2010-11-17 11:32:31 +0000 |
| commit | 1bc90044b655572a4b8aa3b323905e26d37e0f2b (patch) | |
| tree | 84a2d67b24e149b703308c892d1ec37a1019103b /activerecord/lib/active_record/locking/pessimistic.rb | |
| parent | e05162cffad7ae86615c21c6b54ab161d0261c39 (diff) | |
| parent | 401c1835afb5af1a6f429061ac8484227c34909d (diff) | |
| download | rails-1bc90044b655572a4b8aa3b323905e26d37e0f2b.tar.gz rails-1bc90044b655572a4b8aa3b323905e26d37e0f2b.tar.bz2 rails-1bc90044b655572a4b8aa3b323905e26d37e0f2b.zip | |
Merge branch 'master' into nested_has_many_through
Conflicts:
activerecord/lib/active_record/associations/has_many_through_association.rb
activerecord/test/cases/associations/has_many_through_associations_test.rb
Diffstat (limited to 'activerecord/lib/active_record/locking/pessimistic.rb')
| -rw-r--r-- | activerecord/lib/active_record/locking/pessimistic.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/locking/pessimistic.rb b/activerecord/lib/active_record/locking/pessimistic.rb index 9ad6a2baf7..d900831e13 100644 --- a/activerecord/lib/active_record/locking/pessimistic.rb +++ b/activerecord/lib/active_record/locking/pessimistic.rb @@ -47,7 +47,7 @@ module ActiveRecord # or pass true for "FOR UPDATE" (the default, an exclusive row lock). Returns # the locked record. def lock!(lock = true) - reload(:lock => lock) unless new_record? + reload(:lock => lock) if persisted? self end end |