Merge pull request #5535 from markmcspadden/issue_5527_rollbacks

Allow manual rollbacks in after_save to reset object correctly

1 files changed, 9 insertions, 1 deletions

diff --git a/activerecord/lib/active_record/transactions.rb b/activerecord/lib/active_record/transactions.rb
index 64e5640791..30e1035300 100644
--- a/activerecord/lib/active_record/transactions.rb
+++ b/activerecord/lib/active_record/transactions.rb
@@ -290,7 +290,15 @@ module ActiveRecord
       status = nil
       self.class.transaction do
         add_to_transaction
-        status = yield
+        begin
+          status = yield
+        rescue ActiveRecord::Rollback
+          if defined?(@_start_transaction_state) 
+            @_start_transaction_state[:level] = (@_start_transaction_state[:level] || 0) - 1
+          end
+          status = nil
+        end
+        
         raise ActiveRecord::Rollback unless status
       end
       status