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 0321a8f fix multiple registry check (#9118)
0321a8f is described below
commit 0321a8fa41ed37d895595d9d627eefa1e22b74fc
Author: haoyann <[email protected]>
AuthorDate: Mon Oct 25 13:03:08 2021 +0800
fix multiple registry check (#9118)
---
.../java/org/apache/dubbo/registry/multiple/MultipleRegistry.java | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git
a/dubbo-registry/dubbo-registry-multiple/src/main/java/org/apache/dubbo/registry/multiple/MultipleRegistry.java
b/dubbo-registry/dubbo-registry-multiple/src/main/java/org/apache/dubbo/registry/multiple/MultipleRegistry.java
index 50c0cf5..e3e226a 100644
---
a/dubbo-registry/dubbo-registry-multiple/src/main/java/org/apache/dubbo/registry/multiple/MultipleRegistry.java
+++
b/dubbo-registry/dubbo-registry-multiple/src/main/java/org/apache/dubbo/registry/multiple/MultipleRegistry.java
@@ -34,6 +34,7 @@ import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Collectors;
+import static org.apache.dubbo.common.constants.CommonConstants.CHECK_KEY;
import static
org.apache.dubbo.common.constants.RegistryConstants.EMPTY_PROTOCOL;
/**
@@ -92,7 +93,8 @@ public class MultipleRegistry extends AbstractRegistry {
serviceRegistries.put(tmpUrl, registryMap.get(tmpUrl));
continue;
}
- Registry registry =
registryFactory.getRegistry(URL.valueOf(tmpUrl));
+ final URL registryUrl =
URL.valueOf(tmpUrl).addParameterIfAbsent(CHECK_KEY, url.getParameter(CHECK_KEY,
"true"));
+ Registry registry = registryFactory.getRegistry(registryUrl);
registryMap.put(tmpUrl, registry);
serviceRegistries.put(tmpUrl, registry);
}
@@ -106,7 +108,8 @@ public class MultipleRegistry extends AbstractRegistry {
referenceRegistries.put(tmpUrl, registryMap.get(tmpUrl));
continue;
}
- Registry registry =
registryFactory.getRegistry(URL.valueOf(tmpUrl));
+ final URL registryUrl =
URL.valueOf(tmpUrl).addParameterIfAbsent(CHECK_KEY, url.getParameter(CHECK_KEY,
"true"));
+ Registry registry = registryFactory.getRegistry(registryUrl);
registryMap.put(tmpUrl, registry);
referenceRegistries.put(tmpUrl, registry);
}