From d716f0f14ac33389f8e907e0e3d95b060d0556dd Mon Sep 17 00:00:00 2001 From: Carpenter Lee Date: Wed, 29 Aug 2018 17:48:04 +0800 Subject: [PATCH] Fixes #99, fix miss comparison of FlowRule.maxQueueingTimeMs --- .../com/alibaba/csp/sentinel/slots/block/flow/FlowRule.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sentinel-core/src/main/java/com/alibaba/csp/sentinel/slots/block/flow/FlowRule.java b/sentinel-core/src/main/java/com/alibaba/csp/sentinel/slots/block/flow/FlowRule.java index 183082f0..e63f459a 100755 --- a/sentinel-core/src/main/java/com/alibaba/csp/sentinel/slots/block/flow/FlowRule.java +++ b/sentinel-core/src/main/java/com/alibaba/csp/sentinel/slots/block/flow/FlowRule.java @@ -276,6 +276,10 @@ public class FlowRule extends AbstractRule { return false; } + if (maxQueueingTimeMs != flowRule.maxQueueingTimeMs) { + return false; + } + return true; } @@ -291,6 +295,7 @@ public class FlowRule extends AbstractRule { result = 31 * result + (int)(temp ^ (temp >>> 32)); result = 31 * result + warmUpPeriodSec; result = 31 * result + controlBehavior; + result = 31 * result + maxQueueingTimeMs; return result; }