Tweaked OperatedClientConnection interface

git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpasyncclient/branches/protocol-handler-refactoring@1167512 13f79535-47bb-0310-9956-ffa450edef68
apache · Sep 10, 2011 · 60737d5 · 60737d5
1 parent 62e1da7
commit 60737d5
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 20 deletions.
diff --git a/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/DefaultClientConnection.java b/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/DefaultClientConnection.java
@@ -43,7 +43,6 @@
 import org.apache.http.nio.reactor.IOSession;
 import org.apache.http.nio.reactor.SessionInputBuffer;
 import org.apache.http.nio.reactor.SessionOutputBuffer;
-import org.apache.http.nio.reactor.ssl.SSLIOSession;
 import org.apache.http.nio.util.ByteBufferAllocator;
 import org.apache.http.params.HttpParams;
 
@@ -55,7 +54,6 @@ public class DefaultClientConnection
     private final Log log;
 
     private String id;
-    private SSLIOSession ssliosession;
 
     public DefaultClientConnection(
             final String id,
@@ -69,11 +67,6 @@ public DefaultClientConnection(
         if (this.log.isDebugEnabled() || this.wirelog.isDebugEnabled()) {
             this.session = new LoggingIOSession(iosession, this.id, this.log, this.wirelog);
         }
-        if (iosession instanceof SSLIOSession) {
-            this.ssliosession = (SSLIOSession) iosession;
-        } else {
-            this.ssliosession = null;
-        }
     }
 
     public void upgrade(final IOSession iosession) {
@@ -85,15 +78,10 @@ public void upgrade(final IOSession iosession) {
             this.session = iosession;
         }
         this.session.setBufferStatus(this);
-        if (iosession instanceof SSLIOSession) {
-            this.ssliosession = (SSLIOSession) iosession;
-        } else {
-            this.ssliosession = null;
-        }
     }
 
-    public SSLIOSession getSSLIOSession() {
-        return this.ssliosession;
+    public IOSession getIOSession() {
+        return this.session;
     }
 
     @Override

diff --git a/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/ManagedClientConnectionImpl.java b/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/ManagedClientConnectionImpl.java
@@ -238,7 +238,7 @@ public void resetInput() {
 
     public boolean isSecure() {
         OperatedClientConnection conn = ensureConnection();
-        return conn.getSSLIOSession() != null;
+        return conn.getIOSession() instanceof SSLIOSession;
     }
 
     public HttpRoute getRoute() {
@@ -248,8 +248,12 @@ public HttpRoute getRoute() {
 
     public SSLSession getSSLSession() {
         OperatedClientConnection conn = ensureConnection();
-        SSLIOSession iosession = conn.getSSLIOSession();
-        return iosession != null ? iosession.getSSLSession() : null;
+        IOSession iosession = conn.getIOSession();
+        if (iosession instanceof SSLIOSession) {
+            return ((SSLIOSession) iosession).getSSLSession();
+        } else {
+            return null;
+        }
     }
 
     public Object getState() {
@@ -320,7 +324,7 @@ public synchronized void open(
         iosession.setAttribute(ExecutionContext.HTTP_CONNECTION, conn);
 
         if (proxy == null) {
-            tracker.connectTarget(conn.getSSLIOSession() != null);
+            tracker.connectTarget(conn.getIOSession() instanceof SSLIOSession);
         } else {
             tracker.connectProxy(proxy, false);
         }

diff --git a/httpasyncclient/src/main/java/org/apache/http/nio/conn/OperatedClientConnection.java b/httpasyncclient/src/main/java/org/apache/http/nio/conn/OperatedClientConnection.java
@@ -30,13 +30,12 @@
 import org.apache.http.nio.NHttpClientConnection;
 import org.apache.http.nio.NHttpClientIOTarget;
 import org.apache.http.nio.reactor.IOSession;
-import org.apache.http.nio.reactor.ssl.SSLIOSession;
 
 public interface OperatedClientConnection
     extends NHttpClientConnection, HttpInetConnection, NHttpClientIOTarget {
 
     void upgrade(IOSession iosession);
 
-    SSLIOSession getSSLIOSession();
+    IOSession getIOSession();
 
 }