Limit connection affinity retry to 5 attempts

Author: acogoluegnes

src/main/java/com/rabbitmq/client/amqp/impl/AmqpConnection.java

@@ -433,7 +433,8 @@ public <T> T maybeRetry(Supplier<T> task) {
                         return RetryUtils.callAndMaybeRetry(
                             task::get,
                             e -> true,
-                            BackOffDelayPolicy.fixed(Duration.ofMillis(10)),
+                            Duration.ofMillis(10),
+                            5,
                             "Connection affinity operation");
                       }
                     },

src/main/java/com/rabbitmq/client/amqp/impl/RetryUtils.java

@@ -48,6 +48,21 @@ static <T> T callAndMaybeRetry(
         args);
   }
 
+  static <T> T callAndMaybeRetry(
+      Callable<T> operation,
+      Predicate<Exception> retryCondition,
+      Duration waitTime,
+      int attempts,
+      String format,
+      Object... args) {
+    return callAndMaybeRetry(
+        operation,
+        retryCondition,
+        i -> i > attempts ? BackOffDelayPolicy.TIMEOUT : waitTime,
+        format,
+        args);
+  }
+
   static <T> T callAndMaybeRetry(
       Callable<T> operation,
       Predicate<Exception> retryCondition,
@@ -82,7 +97,7 @@ static <T> T callAndMaybeRetry(
             try {
               Thread.sleep(delay.toMillis());
             } catch (InterruptedException ex) {
-              Thread.interrupted();
+              Thread.currentThread().interrupt();
               lastException = ex;
               keepTrying = false;
             }