aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--activerecord/lib/active_record/connection_adapters/abstract/transaction.rb11
-rw-r--r--activerecord/lib/active_record/connection_adapters/abstract_adapter.rb2
2 files changed, 5 insertions, 8 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/transaction.rb b/activerecord/lib/active_record/connection_adapters/abstract/transaction.rb
index e6a53b2122..46aaaae2ec 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/transaction.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/transaction.rb
@@ -43,8 +43,8 @@ module ActiveRecord
end
end
- class ClosedTransaction < Transaction #:nodoc:
- def initialize; super(nil); end
+ class NullTransaction < Transaction #:nodoc:
+ def initialize; end
def closed?; true; end
def open?; false; end
def joinable?; false; end
@@ -203,14 +203,11 @@ module ActiveRecord
end
def current_transaction
- @stack.last || closed_transaction
+ @stack.last || NULL_TRANSACTION
end
private
-
- def closed_transaction
- @closed_transaction ||= ClosedTransaction.new
- end
+ NULL_TRANSACTION = NullTransaction.new
end
end
end
diff --git a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
index 99c728814a..a1b6671664 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
@@ -46,7 +46,7 @@ module ActiveRecord
autoload_at 'active_record/connection_adapters/abstract/transaction' do
autoload :TransactionManager
- autoload :ClosedTransaction
+ autoload :NullTransaction
autoload :RealTransaction
autoload :SavepointTransaction
autoload :TransactionState