diff --git a/src/java/org/apache/http/conn/ManagedClientConnection.java b/src/java/org/apache/http/conn/ManagedClientConnection.java
index 3ae33bb94..a5a8b806d 100644
--- a/src/java/org/apache/http/conn/ManagedClientConnection.java
+++ b/src/java/org/apache/http/conn/ManagedClientConnection.java
@@ -32,13 +32,11 @@
 package org.apache.http.conn;
 
 import java.io.IOException;
-import java.net.Socket;
 
 import org.apache.http.HttpClientConnection;
-import org.apache.http.HttpHost;
 import org.apache.http.HttpInetConnection;
-import org.apache.http.protocol.HttpContext;
 import org.apache.http.params.HttpParams;
+import org.apache.http.protocol.HttpContext;
 
 
 /**
diff --git a/src/java/org/apache/http/conn/impl/AbstractClientConnectionAdapter.java b/src/java/org/apache/http/conn/impl/AbstractClientConnectionAdapter.java
index 8da7b646b..3b06e9bb6 100644
--- a/src/java/org/apache/http/conn/impl/AbstractClientConnectionAdapter.java
+++ b/src/java/org/apache/http/conn/impl/AbstractClientConnectionAdapter.java
@@ -170,6 +170,12 @@ public InetAddress getLocalAddress() {
         return wrappedConnection.getLocalAddress();
     }
 
+    // non-javadoc, see interface HttpInetConnection
+    public int getLocalPort() {
+        assertWrappedConn();
+        return wrappedConnection.getLocalPort();
+    }
+
 
     // non-javadoc, see interface HttpInetConnection
     public InetAddress getRemoteAddress() {
@@ -177,6 +183,11 @@ public InetAddress getRemoteAddress() {
         return wrappedConnection.getRemoteAddress();
     }
 
+    // non-javadoc, see interface HttpInetConnection
+    public int getRemotePort() {
+        assertWrappedConn();
+        return wrappedConnection.getRemotePort();
+    }
 
     // non-javadoc, see interface ManagedClientConnection
     public boolean isSecure() {
diff --git a/src/java/org/apache/http/conn/impl/ThreadSafeClientConnManager.java b/src/java/org/apache/http/conn/impl/ThreadSafeClientConnManager.java
index ab6b9b258..646ab91dd 100644
--- a/src/java/org/apache/http/conn/impl/ThreadSafeClientConnManager.java
+++ b/src/java/org/apache/http/conn/impl/ThreadSafeClientConnManager.java
@@ -34,8 +34,6 @@
 import java.lang.ref.Reference;
 import java.lang.ref.ReferenceQueue;
 import java.lang.ref.WeakReference;
-import java.net.InetAddress;
-import java.net.SocketException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -45,21 +43,17 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.http.HttpEntityEnclosingRequest;
-import org.apache.http.HttpException;
 import org.apache.http.HttpHost;
-import org.apache.http.HttpRequest;
-import org.apache.http.HttpResponse;
+import org.apache.http.conn.ClientConnectionManager;
+import org.apache.http.conn.ClientConnectionOperator;
 import org.apache.http.conn.ConnectionPoolTimeoutException;
 import org.apache.http.conn.HostConfiguration;
-import org.apache.http.conn.ClientConnectionManager;
 import org.apache.http.conn.ManagedClientConnection;
-import org.apache.http.conn.ClientConnectionOperator;
 import org.apache.http.conn.OperatedClientConnection;
 import org.apache.http.conn.params.HttpConnectionManagerParams;
-import org.apache.http.protocol.HttpContext;
-import org.apache.http.params.HttpParams;
 import org.apache.http.impl.DefaultHttpParams;
+import org.apache.http.params.HttpParams;
+import org.apache.http.protocol.HttpContext;
 
 
 /**