connection_pool 0.9.1 → 0.9.2

data/Changes.md

@@ -1,3 +1,8 @@
+0.9.2
+--------
+
+- Fix reentrant checkout leading to early checkin.
+
 0.9.1
 --------
 

data/lib/connection_pool.rb

@@ -44,21 +44,34 @@ class ConnectionPool
   end
 
   def with
-    yield checkout
-  ensure
-    checkin
+    conn = checkout
+    begin
+      yield conn
+    ensure
+      checkin
+    end
   end
   alias_method :with_connection, :with
 
   def checkout
-    ::Thread.current[@key] ||= @available.timed_pop(@timeout)
+    stack = ::Thread.current[@key] ||= []
+
+    if stack.empty?
+      conn = @available.timed_pop(@timeout)
+    else
+      conn = stack.last
+    end
+
+    stack.push conn
+    conn
   end
 
   def checkin
-    conn = ::Thread.current[@key]
-    ::Thread.current[@key] = nil
-    return unless conn
-    @available << conn
+    stack = ::Thread.current[@key]
+    conn = stack.pop
+    if stack.empty?
+      @available << conn
+    end
     nil
   end
 

data/lib/connection_pool/version.rb

@@ -1,3 +1,3 @@
 class ConnectionPool
-  VERSION = "0.9.1"
+  VERSION = "0.9.2"
 end

data/test/test_connection_pool.rb

@@ -86,4 +86,40 @@ class TestConnectionPool < MiniTest::Unit::TestCase
     end
     sleep 0.5
   end
+
+  class Recorder
+    def initialize
+      @calls = []
+    end
+
+    attr_reader :calls
+
+    def do_work(label)
+      @calls << label
+    end
+  end
+
+  def test_nested_checkout
+    recorder = Recorder.new
+    pool = ConnectionPool.new(:size => 1) { recorder }
+    pool.with do |r_outer|
+      @other = Thread.new do |t|
+        pool.with do |r_other|
+          r_other.do_work('other')
+        end
+      end
+
+      pool.with do |r_inner|
+        r_inner.do_work('inner')
+      end
+
+      sleep 0.1
+
+      r_outer.do_work('outer')
+    end
+
+    @other.join
+
+    assert_equal ['inner', 'outer', 'other'], recorder.calls
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: connection_pool
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-02 00:00:00.000000000 Z
+date: 2012-06-30 00:00:00.000000000 Z
 dependencies: []
 description: Generic connection pool for Ruby
 email:
@@ -57,4 +57,3 @@ summary: Generic connection pool for Ruby
 test_files:
 - test/helper.rb
 - test/test_connection_pool.rb
-has_rdoc: