You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2012/09/26 10:19:34 UTC

svn commit: r1390319 - in /httpcomponents/httpclient/branches/4.2.x/httpclient/src/main/java/org/apache/http/impl/conn: PoolingClientConnectionManager.java tsccm/ConnPoolByRoute.java

Author: olegk
Date: Wed Sep 26 08:19:33 2012
New Revision: 1390319

URL: http://svn.apache.org/viewvc?rev=1390319&view=rev
Log:
HTTPCLIENT-1236: Change exception message when timeout getting connection from pool
Contributed by Alf Høgemark <alf at i100.no>

Modified:
    httpcomponents/httpclient/branches/4.2.x/httpclient/src/main/java/org/apache/http/impl/conn/PoolingClientConnectionManager.java
    httpcomponents/httpclient/branches/4.2.x/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/ConnPoolByRoute.java

Modified: httpcomponents/httpclient/branches/4.2.x/httpclient/src/main/java/org/apache/http/impl/conn/PoolingClientConnectionManager.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.2.x/httpclient/src/main/java/org/apache/http/impl/conn/PoolingClientConnectionManager.java?rev=1390319&r1=1390318&r2=1390319&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.2.x/httpclient/src/main/java/org/apache/http/impl/conn/PoolingClientConnectionManager.java (original)
+++ httpcomponents/httpclient/branches/4.2.x/httpclient/src/main/java/org/apache/http/impl/conn/PoolingClientConnectionManager.java Wed Sep 26 08:19:33 2012
@@ -229,7 +229,7 @@ public class PoolingClientConnectionMana
             // Should never happen
             throw new InterruptedException();
         } catch (TimeoutException ex) {
-            throw new ConnectionPoolTimeoutException("Timeout waiting for connection");
+            throw new ConnectionPoolTimeoutException("Timeout waiting for connection from pool");
         }
     }
 

Modified: httpcomponents/httpclient/branches/4.2.x/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/ConnPoolByRoute.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.2.x/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/ConnPoolByRoute.java?rev=1390319&r1=1390318&r2=1390319&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.2.x/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/ConnPoolByRoute.java (original)
+++ httpcomponents/httpclient/branches/4.2.x/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/ConnPoolByRoute.java Wed Sep 26 08:19:33 2012
@@ -414,7 +414,7 @@ public class ConnPoolByRoute extends Abs
                     if (!success && (deadline != null) &&
                         (deadline.getTime() <= System.currentTimeMillis())) {
                         throw new ConnectionPoolTimeoutException
-                            ("Timeout waiting for connection");
+                            ("Timeout waiting for connection from pool");
                     }
                 }
             } // while no entry