v2.0.3

Author: arnett, stu

LICENSE-commons-codec.txt renamed to 3rd-party-licenses/LICENSE-commons-codec.txt

@@ -29,7 +29,7 @@ description = 'Smart REST Client - JAX-RS (Jersey) REST client that provides cli
 ext.githubProjectName = 'smart-client-java'
 
 buildscript {
-    ext.commonBuildVersion = '1.3.2'
+    ext.commonBuildVersion = '1.3.3'
     ext.commonBuildDir = "https://raw.githubusercontent.com/emcvipr/ecs-common-build/v$commonBuildVersion"
     apply from: "$commonBuildDir/ecs-publish.buildscript.gradle", to: buildscript
 }
@@ -39,7 +39,7 @@ apply from: "$commonBuildDir/ecs-publish.gradle"
 dependencies {
     compile 'com.sun.jersey:jersey-client:1.19',
             'com.sun.jersey.contribs:jersey-apache-client4:1.19',
-            'org.apache.httpcomponents:httpclient:4.5',
+            'org.apache.httpcomponents:httpclient:4.2.6',
             'log4j:log4j:1.2.17'
     testCompile 'junit:junit:4.12'
 }

LICENSE-httpclient.txt renamed to 3rd-party-licenses/LICENSE-httpclient.txt

@@ -37,4 +37,13 @@ public interface HostListProvider {
      * (<code>host.setHealthy(false)</code> is called).
      */
     void runHealthCheck(Host host);
+
+    /**
+     * Destroy this provider. Any system resources associated with the provider
+     * will be cleaned up.
+     * <p/>
+     * The provider must not be reused after this method is called otherwise
+     * undefined behavior will occur.
+     */
+    void destroy();
 }

LICENSE-httpcore.txt renamed to 3rd-party-licenses/LICENSE-httpcore.txt

@@ -42,19 +42,16 @@ public LoadBalancer(List<Host> initialHosts) {
      * Returns the host with the lowest response index.
      */
     public Host getTopHost(Map<String, Object> requestProperties) {
-        Host topHost = null;
+        Host topHost = null, topHealthyHost = null;
 
-        long lowestIndex = Long.MAX_VALUE;
+        long lowestIndex = Long.MAX_VALUE, lowestHealthyIndex = Long.MAX_VALUE;
 
         synchronized (hosts) {
             for (Host host : hosts) {
 
                 // apply any veto rules
                 if (shouldVeto(host, requestProperties)) continue;
 
-                // if the host is unhealthy/down, ignore it
-                if (!host.isHealthy()) continue;
-
                 // get response index for a host
                 long hostIndex = host.getResponseIndex();
 
@@ -63,8 +60,17 @@ public Host getTopHost(Map<String, Object> requestProperties) {
                     topHost = host;
                     lowestIndex = hostIndex;
                 }
+
+                // also keep track of the top *healthy* host
+                if (host.isHealthy() && hostIndex < lowestHealthyIndex) {
+                    topHealthyHost = host;
+                    lowestHealthyIndex = hostIndex;
+                }
             }
 
+            // if there are no healthy hosts, we still need a host to contact
+            if (topHealthyHost != null) topHost = topHealthyHost;
+
             // move the top host to the end of the host list as an extra tie-breaker
             hosts.remove(topHost);
             hosts.add(topHost);