From 8f995cb993be622f6158c7fbf003ce99dac2c82b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E8=81=AA=E6=B4=8B?= <1601081222@qq.com> Date: Fri, 21 Jun 2024 18:36:44 +0800 Subject: [PATCH] bug fix --- .../cluster/router/condition/config/ListenableStateRouter.java | 2 +- .../router/condition/config/model/ConditionRuleParser.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/condition/config/ListenableStateRouter.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/condition/config/ListenableStateRouter.java index 636a17e13d..01fe2c4a22 100644 --- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/condition/config/ListenableStateRouter.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/condition/config/ListenableStateRouter.java @@ -148,7 +148,7 @@ public abstract class ListenableStateRouter extends AbstractStateRouter im } } else { for (AbstractStateRouter router : conditionRouters) { - routeResult = router.route(invokers, url, invocation, needToPrintMessage, nodeHolder); + routeResult = router.route(routeResult, url, invocation, needToPrintMessage, nodeHolder); } } diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/condition/config/model/ConditionRuleParser.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/condition/config/model/ConditionRuleParser.java index 23d0678437..37e9da19c6 100644 --- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/condition/config/model/ConditionRuleParser.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/condition/config/model/ConditionRuleParser.java @@ -66,7 +66,8 @@ public class ConditionRuleParser { "Invalid condition config version number.", "", "Ignore this configuration. Only " + RULE_VERSION_V31 + " and below are supported in this release"); - rule = ConditionRouterRule.parseFromMap(map); +// rule = ConditionRouterRule.parseFromMap(map); + rule = new ConditionRouterRule(); rule.setValid(false); } else { // for under v3.1