修正重连时间溢出为负数的问题 hengyunabc#4

cyzh · Mar 24, 2016 · 9e7395b · 9e7395b
1 parent d0a34e1
commit 9e7395b
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/xdiamond-client/src/main/java/io/github/xdiamond/client/net/XDiamondClient.java b/xdiamond-client/src/main/java/io/github/xdiamond/client/net/XDiamondClient.java
@@ -122,7 +122,11 @@ void channelUnregistered(final ChannelHandlerContext ctx) {
 
     int currentRetryInterval = retryIntervalSeconds;
     if (bBackOffRetryInterval) {
-      currentRetryInterval = retryIntervalSeconds * (1 << currentRetryTimes);
+      // 注意currentRetryInterval 可能会溢出
+      currentRetryInterval = retryIntervalSeconds * (currentRetryTimes >= 30 ? 1 << 30 : 1 << currentRetryTimes);
+      if (currentRetryInterval <= 0) {
+        currentRetryInterval = maxRetryIntervalSeconds;
+      }
     }
     if (currentRetryInterval > maxRetryIntervalSeconds) {
       currentRetryInterval = maxRetryIntervalSeconds;