You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by og...@apache.org on 2007/01/16 10:45:15 UTC

svn commit: r496642 - in /jakarta/commons/proper/httpclient/trunk: release_notes.txt src/java/org/apache/commons/httpclient/MultiThreadedHttpConnectionManager.java

Author: oglueck
Date: Tue Jan 16 01:45:14 2007
New Revision: 496642

URL: http://svn.apache.org/viewvc?view=rev&rev=496642
Log:
Fixed leak in ConnectionPool.mapHost

PR: HTTPCLIENT-622
Contributed by: Michael Becke, Ortwin Glück
Reviewed by: Michael Becke, Ortwin Glück

Modified:
    jakarta/commons/proper/httpclient/trunk/release_notes.txt
    jakarta/commons/proper/httpclient/trunk/src/java/org/apache/commons/httpclient/MultiThreadedHttpConnectionManager.java

Modified: jakarta/commons/proper/httpclient/trunk/release_notes.txt
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/httpclient/trunk/release_notes.txt?view=diff&rev=496642&r1=496641&r2=496642
==============================================================================
--- jakarta/commons/proper/httpclient/trunk/release_notes.txt (original)
+++ jakarta/commons/proper/httpclient/trunk/release_notes.txt Tue Jan 16 01:45:14 2007
@@ -1,5 +1,8 @@
 Changes since Release 3.1 Beta 1:
 
+* [HTTPCLIENT-622] - Leak in MultiThreadedHttpConnectionManager.ConnectionPool.mapHosts
+           Contributed by Michael Becke <mbecke at apache.org> and Ortwin Glueck <oglueck at apache.org>
+
 * [HTTPCLIENT-612] - FileRequestEntity now always closes the input file.
            Contributed by Sebastian Bazley <sebb at apache.org>
 

Modified: jakarta/commons/proper/httpclient/trunk/src/java/org/apache/commons/httpclient/MultiThreadedHttpConnectionManager.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/httpclient/trunk/src/java/org/apache/commons/httpclient/MultiThreadedHttpConnectionManager.java?view=diff&rev=496642&r1=496641&r2=496642
==============================================================================
--- jakarta/commons/proper/httpclient/trunk/src/java/org/apache/commons/httpclient/MultiThreadedHttpConnectionManager.java (original)
+++ jakarta/commons/proper/httpclient/trunk/src/java/org/apache/commons/httpclient/MultiThreadedHttpConnectionManager.java Tue Jan 16 01:45:14 2007
@@ -760,7 +760,8 @@
         public synchronized void handleLostConnection(HostConfiguration config) {
             HostConnectionPool hostPool = getHostPool(config);
             hostPool.numConnections--;
-
+            if (hostPool.numConnections == 0) mapHosts.remove(config);
+            
             numConnections--;
             notifyWaitingThread(config);
         }
@@ -866,7 +867,8 @@
             hostPool.freeConnections.remove(connection);
             hostPool.numConnections--;
             numConnections--;
-
+            if (hostPool.numConnections == 0) mapHosts.remove(connectionConfiguration);
+            
             // remove the connection from the timeout handler
             idleConnectionHandler.remove(connection);            
         }



---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org