Merge branch 'master' into fix/spring-aop-issue

apache · Nov 19, 2017 · 1c762f1 · 1c762f1
2 parents 61c7a35 + d2df4db
commit 1c762f1
Showing 1 changed file with 3 additions and 12 deletions.
diff --git a/...t-core/src/main/java/org/skywalking/apm/agent/core/remote/DiscoveryRestServiceClient.java b/...t-core/src/main/java/org/skywalking/apm/agent/core/remote/DiscoveryRestServiceClient.java
@@ -141,21 +141,12 @@ private HttpGet buildGet() {
      */
     private void findBackupServer() {
         selectedServer++;
-        if (selectedServer == serverList.length) {
+        if (selectedServer >= serverList.length) {
             selectedServer = 0;
         }
-    }
-
-    /**
-     * Try to sleep, and ignore the {@link InterruptedException}
-     *
-     * @param millis the length of time to sleep in milliseconds
-     */
-    private void try2Sleep(long millis) {
-        try {
-            Thread.sleep(millis);
-        } catch (InterruptedException e) {
 
+        if (serverList.length == 0) {
+            selectedServer = -1;
         }
     }
 }