Use parenthesis for explicit oredring and use Math.min on bits to shift instead.

1 files changed, 2 insertions, 2 deletions

diff --git a/messagebus/src/main/java/com/yahoo/messagebus/routing/RetryTransientErrorsPolicy.java b/messagebus/src/main/java/com/yahoo/messagebus/routing/RetryTransientErrorsPolicy.java
index 915be2fa279..96655e91b90 100644
--- a/messagebus/src/main/java/com/yahoo/messagebus/routing/RetryTransientErrorsPolicy.java
+++ b/messagebus/src/main/java/com/yahoo/messagebus/routing/RetryTransientErrorsPolicy.java
@@ -49,9 +49,9 @@ public class RetryTransientErrorsPolicy implements RetryPolicy {
     public double getRetryDelay(int retry) {
         long retryMultiplier = 0l;
         if (retry > 1) {
-            retryMultiplier = Math.min(10000, 1L << (retry-1));
+            retryMultiplier = 1L << Math.min(20, retry-1);
         }
 
-        return Math.min(10.0, retryMultiplier*baseDelayUS.get()/US);
+        return Math.min(10.0, (retryMultiplier*baseDelayUS.get())/US);
     }
 }