Simplified retry loop logic

janusgraph-es/src/main/java/org/janusgraph/diskstorage/es/rest/RestElasticSearchClient.java

@@ -574,31 +574,24 @@ private Response performRequest(String method, String path, byte[] requestData)
 
     private Response performRequestWithRetry(Request request) throws IOException {
         int retryCount = 0;
-        ResponseException lastException;
-        do {
-            if (retryCount > 0) {
+        while (true) {
+            try {
+                return delegate.performRequest(request);
+            } catch (ResponseException e) {
+                if (!retryOnErrorCodes.contains(e.getResponse().getStatusLine().getStatusCode()) || retryCount >= retryAttemptLimit) {
+                    throw e;
+                }
                 //Wait before trying again
                 long waitDurationMs = Math.min((long) (retryInitialWaitMs * Math.pow(10, retryCount - 1)), retryMaxWaitMs);
                 log.warn("Retrying Elasticsearch request in {} ms. Attempt {} of {}", waitDurationMs, retryCount, retryAttemptLimit);
                 try {
                     Thread.sleep(waitDurationMs);
-                } catch (InterruptedException e) {
-                    throw new RuntimeException(String.format("Thread interrupted while waiting for retry attempt %d of %d", retryCount, retryAttemptLimit), e);
+                } catch (InterruptedException interruptedException) {
+                    throw new RuntimeException(String.format("Thread interrupted while waiting for retry attempt %d of %d", retryCount, retryAttemptLimit), interruptedException);
                 }
             }
-            try {
-                return delegate.performRequest(request);
-            } catch (ResponseException e) {
-                if (!retryOnErrorCodes.contains(e.getResponse().getStatusLine().getStatusCode())) {
-                    throw e;
-                }
-                lastException = e;
-            }
             retryCount++;
-        } while (retryCount <= retryAttemptLimit);
-
-        //If we've exceeded our retry limit then throw the last exception that was captured from retrying
-        throw lastException;
+        }
     }
 
     private Response performRequest(Request request, byte[] requestData) throws IOException {