hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r1239223 - in /httpcomponents/httpclient/trunk: httpclient/src/main/java/org/apache/http/impl/conn/PoolingClientConnectionManager.java pom.xml
Date Wed, 01 Feb 2012 17:36:33 GMT
Author: olegk
Date: Wed Feb  1 17:36:32 2012
New Revision: 1239223

URL: http://svn.apache.org/viewvc?rev=1239223&view=rev
Log:
Upgraded to HttpCore 4.2-beta1

Modified:
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/PoolingClientConnectionManager.java
    httpcomponents/httpclient/trunk/pom.xml

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/PoolingClientConnectionManager.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/PoolingClientConnectionManager.java?rev=1239223&r1=1239222&r2=1239223&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/PoolingClientConnectionManager.java
(original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/PoolingClientConnectionManager.java
Wed Feb  1 17:36:32 2012
@@ -280,18 +280,14 @@ public class PoolingClientConnectionMana
         }
     }
 
-    public void shutdown(long waitMs) throws IOException {
-        this.log.debug("Connection manager is shutting down");
-        this.pool.shutdown(waitMs);
-        this.log.debug("Connection manager shut down");
-    }
-
     public void shutdown() {
+        this.log.debug("Connection manager is shutting down");
         try {
-            shutdown(2000);
+            this.pool.shutdown();
         } catch (IOException ex) {
-            this.log.error("I/O exception while shutting down connection pool", ex);
+            this.log.debug("I/O exception shutting down connection manager", ex);
         }
+        this.log.debug("Connection manager shut down");
     }
 
     public void closeIdleConnections(long idleTimeout, TimeUnit tunit) {

Modified: httpcomponents/httpclient/trunk/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/pom.xml?rev=1239223&r1=1239222&r2=1239223&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/pom.xml (original)
+++ httpcomponents/httpclient/trunk/pom.xml Wed Feb  1 17:36:32 2012
@@ -67,7 +67,7 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <httpcore.version>4.2-alpha2</httpcore.version>
+    <httpcore.version>4.2-beta1</httpcore.version>
     <commons-logging.version>1.1.1</commons-logging.version>
     <commons-codec.version>1.4</commons-codec.version>
     <ehcache.version>2.2.0</ehcache.version>



Mime
View raw message