fix for Rails 2.3.[6-8]

zaius · Aug 9, 2010 · 46a0ce0 · 46a0ce0
1 parent 85a95ad
commit 46a0ce0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/README.markdown b/README.markdown
@@ -183,7 +183,7 @@ including:
 -  Ahmed Adam, Tristan Schneiter, Scott Haug, Andrew Garfield, Eugene Otto, Dan Sharp,
   Olivier Ruffin, Adrian Duyzer, Cyrille Labesse
 
--  Garry Tan, Matt Jankowski (Rails 2.2.x fixes)
+-  Garry Tan, Matt Jankowski (Rails 2.2.x fixes), Mina Naguib (Rails 2.3.6 fix)
 
 -  Tim Kadom, Mauricio Marcon Zaffari, Danial Pearce, Hongli Lai, Scott Wadden
   (passenger fixes)

diff --git a/lib/patches.rb b/lib/patches.rb
@@ -3,9 +3,11 @@ class ActiveRecord::Base
   # reconnect without disconnecting
   if Spawn::RAILS_2_2
     def self.spawn_reconnect(klass=self)
-      # keep ancestors' connection_handlers around to avoid them being garbage collected
-      (@@ancestor_connection_handlers ||= []) << @@connection_handler
-      @@connection_handler = ActiveRecord::ConnectionAdapters::ConnectionHandler.new
+      # keep ancestors' connection_handlers around to avoid them being garbage collected in the forked child
+      @@ancestor_connection_handlers ||= []
+      @@ancestor_connection_handlers << self.connection_handler
+      self.connection_handler = ActiveRecord::ConnectionAdapters::ConnectionHandler.new
+
       establish_connection
     end
   else