svn commit: r1242073 - in /httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn: DefaultAsyncClientConnection.java ManagedAsyncClientConnectionImpl.java

[ol...@apache.org]

Author: olegk
Date: Wed Feb  8 20:16:41 2012
New Revision: 1242073

URL: http://svn.apache.org/viewvc?rev=1242073&view=rev
Log:
HTTPASYNC-9: SSLIOSession wrappped with LogginIOSession treated as insecure

Modified:
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/DefaultAsyncClientConnection.java
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/ManagedAsyncClientConnectionImpl.java

Modified: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/DefaultAsyncClientConnection.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/DefaultAsyncClientConnection.java?rev=1242073&r1=1242072&r2=1242073&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/DefaultAsyncClientConnection.java (original)
+++ httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/DefaultAsyncClientConnection.java Wed Feb  8 20:16:41 2012
@@ -54,6 +54,7 @@ public class DefaultAsyncClientConnectio
     private final Log log;
 
     private String id;
+    private IOSession original;
 
     public DefaultAsyncClientConnection(
             final String id,
@@ -63,25 +64,25 @@ public class DefaultAsyncClientConnectio
             final HttpParams params) {
         super(iosession, responseFactory, allocator, params);
         this.id = id;
+        this.original = iosession;
         this.log = LogFactory.getLog(iosession.getClass());
         if (this.log.isDebugEnabled() || this.wirelog.isDebugEnabled()) {
-            this.session = new LoggingIOSession(iosession, this.id, this.log, this.wirelog);
+            bind(new LoggingIOSession(iosession, this.id, this.log, this.wirelog));
         }
     }
 
     public void upgrade(final IOSession iosession) {
-        this.session.setBufferStatus(null);
+        this.original = iosession;
         if (this.log.isDebugEnabled() || this.wirelog.isDebugEnabled()) {
             this.log.debug(this.id + " Upgrade session " + iosession);
-            this.session = new LoggingIOSession(iosession, this.id, this.headerlog, this.wirelog);
+            bind(new LoggingIOSession(iosession, this.id, this.headerlog, this.wirelog));
         } else {
-            this.session = iosession;
+            bind(iosession);
         }
-        this.session.setBufferStatus(this);
     }
 
     public IOSession getIOSession() {
-        return this.session;
+        return this.original;
     }
 
     @Override

Modified: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/ManagedAsyncClientConnectionImpl.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/ManagedAsyncClientConnectionImpl.java?rev=1242073&r1=1242072&r2=1242073&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/ManagedAsyncClientConnectionImpl.java (original)
+++ httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/ManagedAsyncClientConnectionImpl.java Wed Feb  8 20:16:41 2012
@@ -62,7 +62,7 @@ class ManagedAsyncClientConnectionImpl i
     private volatile boolean reusable;
     private volatile long duration;
 
-    public ManagedAsyncClientConnectionImpl(
+    ManagedAsyncClientConnectionImpl(
             final ClientAsyncConnectionManager manager,
             final HttpPoolEntry poolEntry) {
         super();
@@ -296,7 +296,8 @@ class ManagedAsyncClientConnectionImpl i
 
     public synchronized void open(
             final HttpRoute route,
-            final HttpContext context, final HttpParams params) throws IOException {
+            final HttpContext context, 
+            final HttpParams params) throws IOException {
         HttpPoolEntry entry = ensurePoolEntry();
         RouteTracker tracker = entry.getTracker();
         if (tracker.isConnected()) {