Merge pull request #615 from estolfo/RUBY-908-timeout

RUBY-908 Don't checkin nil connection back to the pool

Author: estolfo

lib/mongo/server/connection_pool.rb

@@ -98,7 +98,7 @@ def with_connection
           connection = checkout
           yield(connection)
         ensure
-          checkin(connection)
+          checkin(connection) if connection
         end
       end
 

spec/mongo/server/connection_pool_spec.rb

@@ -117,4 +117,31 @@
       expect(pool.inspect).to include(pool.__send__(:queue).inspect)
     end
   end
+
+  describe '#with_connection' do
+
+    let(:server) do
+      Mongo::Server.new(address, Mongo::Event::Listeners.new, ssl: SSL)
+    end
+
+    let(:pool) do
+      described_class.get(server)
+    end
+
+    context 'when a connection cannot be checked out' do
+
+      before do
+        allow(pool).to receive(:checkout).and_return(nil)
+        pool.with_connection { |c| c }
+      end
+
+      let(:queue) do
+        pool.send(:queue).queue
+      end
+
+      it 'does not add the connection to the pool' do
+        expect(queue.size).to eq(1)
+      end
+    end
+  end
 end