svn commit: r500374 - in /jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/conn: ManagedClientConnection.java impl/AbstractClientConnectionAdapter.java impl/ThreadSafeClientConnManager.java

[ol...@apache.org]

Author: olegk
Date: Fri Jan 26 14:06:08 2007
New Revision: 500374

URL: http://svn.apache.org/viewvc?view=rev&rev=500374
Log:
* Fixed AbstractClientConnectionAdapter breakage caused by the latest API changes in HttpCore
* Removed unused imports

Modified:
    jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/conn/ManagedClientConnection.java
    jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/conn/impl/AbstractClientConnectionAdapter.java
    jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/conn/impl/ThreadSafeClientConnManager.java

Modified: jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/conn/ManagedClientConnection.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/conn/ManagedClientConnection.java?view=diff&rev=500374&r1=500373&r2=500374
==============================================================================
--- jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/conn/ManagedClientConnection.java (original)
+++ jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/conn/ManagedClientConnection.java Fri Jan 26 14:06:08 2007
@@ -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;
 
 
 /**

Modified: jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/conn/impl/AbstractClientConnectionAdapter.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/conn/impl/AbstractClientConnectionAdapter.java?view=diff&rev=500374&r1=500373&r2=500374
==============================================================================
--- jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/conn/impl/AbstractClientConnectionAdapter.java (original)
+++ jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/conn/impl/AbstractClientConnectionAdapter.java Fri Jan 26 14:06:08 2007
@@ -170,6 +170,12 @@
         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 @@
         return wrappedConnection.getRemoteAddress();
     }
 
+    // non-javadoc, see interface HttpInetConnection
+    public int getRemotePort() {
+        assertWrappedConn();
+        return wrappedConnection.getRemotePort();
+    }
 
     // non-javadoc, see interface ManagedClientConnection
     public boolean isSecure() {

Modified: jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/conn/impl/ThreadSafeClientConnManager.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/conn/impl/ThreadSafeClientConnManager.java?view=diff&rev=500374&r1=500373&r2=500374
==============================================================================
--- jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/conn/impl/ThreadSafeClientConnManager.java (original)
+++ jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/conn/impl/ThreadSafeClientConnManager.java Fri Jan 26 14:06:08 2007
@@ -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;
 
 
 /**