diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/acts_as_versioned.rb | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/acts_as_versioned.rb b/lib/acts_as_versioned.rb index 5a0e6dc62..e7a8ce780 100644 --- a/lib/acts_as_versioned.rb +++ b/lib/acts_as_versioned.rb @@ -471,9 +471,11 @@ module ActiveRecord #:nodoc: def without_locking(&block) current = ActiveRecord::Base.lock_optimistically ActiveRecord::Base.lock_optimistically = false if current - result = block.call - ActiveRecord::Base.lock_optimistically = true if current - result + begin + block.call + ensure + ActiveRecord::Base.lock_optimistically = true if current + end end end end |