svn commit: r537637 - in /jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/impl/client: DefaultClientRequestDirector.java DefaultHttpClient.java

[ol...@apache.org]

Author: olegk
Date: Sun May 13 11:54:06 2007
New Revision: 537637

URL: http://svn.apache.org/viewvc?view=rev&rev=537637
Log:
Some code cleanups

Modified:
    jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/impl/client/DefaultClientRequestDirector.java
    jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/impl/client/DefaultHttpClient.java

Modified: jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/impl/client/DefaultClientRequestDirector.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/impl/client/DefaultClientRequestDirector.java?view=diff&rev=537637&r1=537636&r2=537637
==============================================================================
--- jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/impl/client/DefaultClientRequestDirector.java (original)
+++ jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/impl/client/DefaultClientRequestDirector.java Sun May 13 11:54:06 2007
@@ -65,7 +65,6 @@
 import org.apache.http.conn.ManagedClientConnection;
 import org.apache.http.conn.RouteDirector;
 import org.apache.http.conn.Scheme;
-import org.apache.http.conn.SchemeRegistry;
 import org.apache.http.message.BasicHttpRequest;
 import org.apache.http.params.HttpConnectionParams;
 import org.apache.http.params.HttpParams;
@@ -493,8 +492,8 @@
         String host = target.getHostName();
         int port = target.getPort();
         if (port < 0) {
-            SchemeRegistry schemeREgistry = connManager.getSchemeRegistry();
-            Scheme scheme = schemeREgistry.getScheme(target.getSchemeName());
+            Scheme scheme = connManager.getSchemeRegistry().
+                getScheme(target.getSchemeName());
             port = scheme.getDefaultPort();
         }
         
@@ -568,8 +567,8 @@
                     uri.getPort(),
                     uri.getScheme());
             
-            SchemeRegistry schemeRegistry = this.connManager.getSchemeRegistry();
-            Scheme schm = schemeRegistry.getScheme(newTarget.getSchemeName());
+            Scheme schm = connManager.getSchemeRegistry().
+                getScheme(newTarget.getSchemeName());
             
             InetAddress localAddress = oldRoute.getLocalAddress();
             HttpHost proxy = oldRoute.getProxyHost();

Modified: jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/impl/client/DefaultHttpClient.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/impl/client/DefaultHttpClient.java?view=diff&rev=537637&r1=537636&r2=537637
==============================================================================
--- jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/impl/client/DefaultHttpClient.java (original)
+++ jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/impl/client/DefaultHttpClient.java Sun May 13 11:54:06 2007
@@ -251,8 +251,8 @@
                 ("Target host must not be null.");
         }
 
-        SchemeRegistry schemeRegistry = getConnectionManager().getSchemeRegistry();
-        Scheme schm = schemeRegistry.getScheme(target.getSchemeName());
+        Scheme schm = getConnectionManager().getSchemeRegistry().
+            getScheme(target.getSchemeName());
         // as it is typically used for TLS/SSL, we assume that
         // a layered scheme implies a secure connection
         HttpRoute route = new HttpRoute(target, null, schm.isLayered());