From 68198c3e38d7d5e69564cfd5fdb982673aedaee8 Mon Sep 17 00:00:00 2001
From: Yuri Smirnov <tycooon@yandex.ru>
Date: Thu, 5 Feb 2015 16:21:37 +0300
Subject: fix transaction rollback in case of aborting thread

---
 .../lib/active_record/connection_adapters/abstract/transaction.rb       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'activerecord/lib')

diff --git a/activerecord/lib/active_record/connection_adapters/abstract/transaction.rb b/activerecord/lib/active_record/connection_adapters/abstract/transaction.rb
index 1eb30956d4..11440e30d4 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/transaction.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/transaction.rb
@@ -185,7 +185,7 @@ module ActiveRecord
       ensure
         unless error
           if Thread.current.status == 'aborting'
-            rollback_transaction
+            rollback_transaction if transaction
           else
             begin
               commit_transaction
-- 
cgit v1.2.3