Return-Path: X-Original-To: apmail-hc-commits-archive@www.apache.org Delivered-To: apmail-hc-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8EC61774A for ; Thu, 11 Aug 2011 07:45:06 +0000 (UTC) Received: (qmail 4986 invoked by uid 500); 11 Aug 2011 07:45:00 -0000 Delivered-To: apmail-hc-commits-archive@hc.apache.org Received: (qmail 4586 invoked by uid 500); 11 Aug 2011 07:44:42 -0000 Mailing-List: contact commits-help@hc.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "HttpComponents Project" Delivered-To: mailing list commits@hc.apache.org Received: (qmail 1878 invoked by uid 99); 11 Aug 2011 07:44:33 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 11 Aug 2011 07:44:33 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 11 Aug 2011 07:44:30 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 57B982388A56 for ; Thu, 11 Aug 2011 07:44:10 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: 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 Date: Thu, 11 Aug 2011 07:44:10 -0000 To: commits@hc.apache.org From: olegk@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110811074410.57B982388A56@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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)) {