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 2011/08/11 09:44:10 UTC
svn commit: r1156521 - in /httpcomponents/httpasyncclient/branches/conn-mgmt-redesign/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn: ClientConnAdaptor.java ManagedClientConnectionImpl.java PoolingClientConnectionManager.java

Author: olegk
Date: Thu Aug 11 07:44:09 2011
New Revision: 1156521

URL: http://svn.apache.org/viewvc?rev=1156521&view=rev
Log:
Renamed class

Added:
    httpcomponents/httpasyncclient/branches/conn-mgmt-redesign/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/ManagedClientConnectionImpl.java
      - copied, changed from r1156520, httpcomponents/httpasyncclient/branches/conn-mgmt-redesign/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/ClientConnAdaptor.java
Removed:
    httpcomponents/httpasyncclient/branches/conn-mgmt-redesign/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/ClientConnAdaptor.java
Modified:
    httpcomponents/httpasyncclient/branches/conn-mgmt-redesign/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/PoolingClientConnectionManager.java

Copied: httpcomponents/httpasyncclient/branches/conn-mgmt-redesign/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/ManagedClientConnectionImpl.java (from r1156520, httpcomponents/httpasyncclient/branches/conn-mgmt-redesign/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/ClientConnAdaptor.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/branches/conn-mgmt-redesign/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/ManagedClientConnectionImpl.java?p2=httpcomponents/httpasyncclient/branches/conn-mgmt-redesign/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/ManagedClientConnectionImpl.java&p1=httpcomponents/httpasyncclient/branches/conn-mgmt-redesign/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/ClientConnAdaptor.java&r1=1156520&r2=1156521&rev=1156521&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/branches/conn-mgmt-redesign/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/ClientConnAdaptor.java (original)
+++ httpcomponents/httpasyncclient/branches/conn-mgmt-redesign/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/ManagedClientConnectionImpl.java Thu Aug 11 07:44:09 2011
@@ -56,14 +56,14 @@ import org.apache.http.params.HttpParams
 import org.apache.http.protocol.ExecutionContext;
 import org.apache.http.protocol.HttpContext;
 
-class ClientConnAdaptor implements ManagedClientConnection {
+class ManagedClientConnectionImpl implements ManagedClientConnection {
 
     private final ClientConnectionManager manager;
     private volatile HttpPoolEntry poolEntry;
     private volatile boolean reusable;
     private volatile long duration;
 
-    public ClientConnAdaptor(
+    public ManagedClientConnectionImpl(
             final ClientConnectionManager manager,
             final HttpPoolEntry poolEntry) {
         super();

Modified: httpcomponents/httpasyncclient/branches/conn-mgmt-redesign/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/PoolingClientConnectionManager.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/branches/conn-mgmt-redesign/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/PoolingClientConnectionManager.java?rev=1156521&r1=1156520&r2=1156521&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/branches/conn-mgmt-redesign/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/PoolingClientConnectionManager.java (original)
+++ httpcomponents/httpasyncclient/branches/conn-mgmt-redesign/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/PoolingClientConnectionManager.java Thu Aug 11 07:44:09 2011
@@ -176,14 +176,14 @@ public class PoolingClientConnectionMana
         if (conn == null) {
             throw new IllegalArgumentException("HTTP connection may not be null");
         }
-        if (!(conn instanceof ClientConnAdaptor)) {
+        if (!(conn instanceof ManagedClientConnectionImpl)) {
             throw new IllegalArgumentException("Connection class mismatch, " +
                  "connection not obtained from this manager");
         }
         if (tunit == null) {
             throw new IllegalArgumentException("Time unit may not be null");
         }
-        ClientConnAdaptor managedConn = (ClientConnAdaptor) conn;
+        ManagedClientConnectionImpl managedConn = (ManagedClientConnectionImpl) conn;
         ClientConnectionManager manager = managedConn.getManager();
         if (manager != null && manager != this) {
             throw new IllegalArgumentException("Connection not obtained from this manager");
@@ -287,7 +287,7 @@ public class PoolingClientConnectionMana
             if (log.isDebugEnabled()) {
                 log.debug("Connection leased: " + format(entry) + formatStats(entry.getRoute()));
             }
-            ManagedClientConnection conn = new ClientConnAdaptor(
+            ManagedClientConnection conn = new ManagedClientConnectionImpl(
                     PoolingClientConnectionManager.this,
                     entry);
             if (!this.future.completed(conn)) {