* lib/drb/drb.rb(DRbConn self.open): If socket pool is full, close

  the socket whose last-access-time is oldest. (and add new one)


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@6580 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 7 insertions, 4 deletions

diff --git a/lib/drb/drb.rb b/lib/drb/drb.rb
index 829b9cb91..8919a946b 100644
--- a/lib/drb/drb.rb
+++ b/lib/drb/drb.rb
@@ -1080,11 +1080,14 @@ module DRb
 	return succ, result
 
       ensure
-	@mutex.synchronize do
-	  if @pool.size > POOL_SIZE or ! succ
-	    conn.close if conn
+	if conn
+	  if succ
+	    @mutex.synchronize do
+	      @pool.unshift(conn)
+	      @pool.pop.close while @pool.size > POOL_SIZE
+	    end
 	  else
-	    @pool.unshift(conn)
+	    conn.close
 	  end
 	end
       end