PR comment fixes

Author: MichaelGHSeg

analytics/src/main/java/com/segment/analytics/internal/AnalyticsClient.java

@@ -247,7 +247,7 @@ synchronized void clearRateLimitState() {
   synchronized boolean isRateLimited() {
     if (!rateLimited) return false;
     if (System.currentTimeMillis() >= rateLimitWaitUntil) {
-      rateLimited = false;
+      clearRateLimitState();
       return false;
     }
     return true;
@@ -646,13 +646,19 @@ public void run() {
 
           // Sleep for Retry-After then retry this batch
           if (result.retryAfterSeconds > 0) {
+            // Defensive guard: if backoff retries have already been exhausted,
+            // do not continue looping in the Retry-After path.
+            if (backoffAttempts >= maxBackoffAttempts) {
+              break;
+            }
             try {
               TimeUnit.SECONDS.sleep(result.retryAfterSeconds);
             } catch (InterruptedException e) {
               client.log.print(
                   DEBUG,
                   "Thread interrupted while waiting for Retry-After for batch %s.",
                   batch.sequence());
+              client.clearRateLimitState();
               Thread.currentThread().interrupt();
               return;
             }
@@ -667,6 +673,7 @@ public void run() {
             } catch (InterruptedException e) {
               client.log.print(
                   DEBUG, "Thread interrupted while backing off for batch %s.", batch.sequence());
+              client.clearRateLimitState();
               Thread.currentThread().interrupt();
               return;
             }
@@ -691,11 +698,13 @@ public void run() {
         } catch (InterruptedException e) {
           client.log.print(
               DEBUG, "Thread interrupted while backing off for batch %s.", batch.sequence());
+          client.clearRateLimitState();
           Thread.currentThread().interrupt();
           return;
         }
       }
 
+      client.clearRateLimitState();
       client.log.print(ERROR, "Could not upload batch %s. Retries exhausted.", batch.sequence());
       notifyCallbacksWithException(
           batch, new IOException(Integer.toString(totalAttempts) + " retries exhausted"));