[dubbo] branch 3.0 updated: Add volatile modifier to some variables in ListenableRouter (#8579)

[albumenj]

This is an automated email from the ASF dual-hosted git repository.

albumenj pushed a commit to branch 3.0
in repository https://gitbox.apache.org/repos/asf/dubbo.git


The following commit(s) were added to refs/heads/3.0 by this push:
     new 31e1aa6  Add volatile modifier to some variables in ListenableRouter 
(#8579)
31e1aa6 is described below

commit 31e1aa6b597339e1b724f852a4b81df9bc367803
Author: 灼华 <43363120+burnin...@users.noreply.github.com>
AuthorDate: Fri Aug 27 13:48:40 2021 +0800

    Add volatile modifier to some variables in ListenableRouter (#8579)
    
    * Remove useless code in ConditionRouter
    
    * Add volatile modifier to some variables in ListenableRouter
---
 .../apache/dubbo/rpc/cluster/router/condition/ConditionRouter.java    | 3 ---
 .../dubbo/rpc/cluster/router/condition/config/ListenableRouter.java   | 4 ++--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git 
a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/condition/ConditionRouter.java
 
b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/condition/ConditionRouter.java
index 3fd6a11..17f3afa 100644
--- 
a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/condition/ConditionRouter.java
+++ 
b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/condition/ConditionRouter.java
@@ -251,9 +251,6 @@ public class ConditionRouter extends AbstractRouter {
                 sampleValue = url.getHost();
             } else {
                 sampleValue = sample.get(key);
-                if (sampleValue == null) {
-                    sampleValue = sample.get(key);
-                }
             }
             if (sampleValue != null) {
                 if (!matchPair.getValue().isMatch(sampleValue, param)) {
diff --git 
a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/condition/config/ListenableRouter.java
 
b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/condition/config/ListenableRouter.java
index 594cc69..c67440d 100644
--- 
a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/condition/config/ListenableRouter.java
+++ 
b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/condition/config/ListenableRouter.java
@@ -46,8 +46,8 @@ public abstract class ListenableRouter extends AbstractRouter 
implements Configu
     private static final String RULE_SUFFIX = ".condition-router";
 
     private static final Logger logger = 
LoggerFactory.getLogger(ListenableRouter.class);
-    private ConditionRouterRule routerRule;
-    private List<ConditionRouter> conditionRouters = Collections.emptyList();
+    private volatile ConditionRouterRule routerRule;
+    private volatile List<ConditionRouter> conditionRouters = 
Collections.emptyList();
 
     public ListenableRouter(URL url, String ruleKey) {
         super(url);