From eb0eab0a8644bf74f40f7f0be6bd8da1d09bb119 Mon Sep 17 00:00:00 2001
From: Oleg Kalnichevski <olegk@apache.org>
Date: Thu, 16 Dec 2010 20:42:22 +0000
Subject: [PATCH] Code clean-ups

git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1050152 13f79535-47bb-0310-9956-ffa450edef68
---
 .../http/conn/routing/RouteTracker.java       | 31 +++++++------------
 .../impl/client/DefaultRequestDirector.java   | 17 ++++------
 2 files changed, 18 insertions(+), 30 deletions(-)

diff --git a/httpclient/src/main/java/org/apache/http/conn/routing/RouteTracker.java b/httpclient/src/main/java/org/apache/http/conn/routing/RouteTracker.java
index 86ada48ba..dcf227d77 100644
--- a/httpclient/src/main/java/org/apache/http/conn/routing/RouteTracker.java
+++ b/httpclient/src/main/java/org/apache/http/conn/routing/RouteTracker.java
@@ -294,7 +294,7 @@ public final class RouteTracker implements RouteInfo, Cloneable {
             return false;
 
         RouteTracker that = (RouteTracker) o;
-        return 
+        return
             // Do the cheapest checks first
             (this.connected == that.connected) &&
             (this.secure    == that.secure) &&
@@ -315,26 +315,19 @@ public final class RouteTracker implements RouteInfo, Cloneable {
      */
     @Override
     public final int hashCode() {
-
-        int hc = this.targetHost.hashCode();
-
-        if (this.localAddress != null)
-            hc ^= localAddress.hashCode();
+        int hash = LangUtils.HASH_SEED;
+        hash = LangUtils.hashCode(hash, this.targetHost);
+        hash = LangUtils.hashCode(hash, this.localAddress);
         if (this.proxyChain != null) {
-            hc ^= proxyChain.length;
-            for (int i=0; i<proxyChain.length; i++)
-                hc ^= proxyChain[i].hashCode();
+            for (int i = 0; i < this.proxyChain.length; i++) {
+                hash = LangUtils.hashCode(hash, this.proxyChain[i]);
+            }
         }
-
-        if (this.connected)
-            hc ^= 0x11111111;
-        if (this.secure)
-            hc ^= 0x22222222;
-
-        hc ^= this.tunnelled.hashCode();
-        hc ^= this.layered.hashCode();
-
-        return hc;
+        hash = LangUtils.hashCode(hash, this.connected);
+        hash = LangUtils.hashCode(hash, this.secure);
+        hash = LangUtils.hashCode(hash, this.tunnelled);
+        hash = LangUtils.hashCode(hash, this.layered);
+        return hash;
     }
 
     /**
diff --git a/httpclient/src/main/java/org/apache/http/impl/client/DefaultRequestDirector.java b/httpclient/src/main/java/org/apache/http/impl/client/DefaultRequestDirector.java
index 1054152d0..c3aa95d93 100644
--- a/httpclient/src/main/java/org/apache/http/impl/client/DefaultRequestDirector.java
+++ b/httpclient/src/main/java/org/apache/http/impl/client/DefaultRequestDirector.java
@@ -760,19 +760,15 @@ public class DefaultRequestDirector implements RequestDirector {
                 break;
 
             case HttpRouteDirector.UNREACHABLE:
-                throw new IllegalStateException
-                    ("Unable to establish route." +
-                     "\nplanned = " + route +
-                     "\ncurrent = " + fact);
-
+                throw new HttpException("Unable to establish route: " +
+                        "planned = " + route + "; current = " + fact);
             case HttpRouteDirector.COMPLETE:
                 // do nothing
                 break;
-
             default:
-                throw new IllegalStateException
-                    ("Unknown step indicator "+step+" from RouteDirector.");
-            } // switch
+                throw new IllegalStateException("Unknown step indicator "
+                        + step + " from RouteDirector.");
+            }
 
         } while (step > HttpRouteDirector.COMPLETE);
 
@@ -945,8 +941,7 @@ public class DefaultRequestDirector implements RequestDirector {
         // complexity. Feel free to submit patches that refactor the code in
         // createTunnelToTarget to facilitate re-use for proxy tunnelling.
 
-        throw new UnsupportedOperationException
-            ("Proxy chains are not supported.");
+        throw new HttpException("Proxy chains are not supported.");
     }