aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/dispatcher.rb
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2009-02-24 11:34:32 -0600
committerJoshua Peek <josh@joshpeek.com>2009-02-24 11:34:32 -0600
commit1b22071b276a2a2b3e65e6db40c6a0aa92d9ebc3 (patch)
tree240347e78d8877a4e98ea9fdda82f5c57428b620 /actionpack/lib/action_controller/dispatcher.rb
parentd32eb410f19f6872df1e1e1810840c0f5aa13b50 (diff)
downloadrails-1b22071b276a2a2b3e65e6db40c6a0aa92d9ebc3.tar.gz
rails-1b22071b276a2a2b3e65e6db40c6a0aa92d9ebc3.tar.bz2
rails-1b22071b276a2a2b3e65e6db40c6a0aa92d9ebc3.zip
Ensure ActiveRecord session store's connections are checked in after each request [#1927 state:resolved]
Diffstat (limited to 'actionpack/lib/action_controller/dispatcher.rb')
-rw-r--r--actionpack/lib/action_controller/dispatcher.rb7
1 files changed, 0 insertions, 7 deletions
diff --git a/actionpack/lib/action_controller/dispatcher.rb b/actionpack/lib/action_controller/dispatcher.rb
index ec40b5c4e6..07931e4a4a 100644
--- a/actionpack/lib/action_controller/dispatcher.rb
+++ b/actionpack/lib/action_controller/dispatcher.rb
@@ -13,7 +13,6 @@ module ActionController
end
if defined?(ActiveRecord)
- after_dispatch :checkin_connections
to_prepare(:activerecord_instantiate_observers) { ActiveRecord::Base.instantiate_observers }
end
@@ -115,11 +114,5 @@ module ActionController
def flush_logger
Base.logger.flush
end
-
- def checkin_connections
- # Don't return connection (and peform implicit rollback) if this request is a part of integration test
- return if @env.key?("rack.test")
- ActiveRecord::Base.clear_active_connections!
- end
end
end