From f3843ef4d337fe30a80704a46a83fa10bf53bfc4 Mon Sep 17 00:00:00 2001 From: xiaoheng1 <2018154970@qq.com> Date: Tue, 9 Mar 2021 19:52:16 +0800 Subject: [PATCH 1/2] fix #7351 use api, application-level service discovery model startup error --- .../registry/client/DefaultRegistryClusterIdentifier.java | 3 ++- .../registry/client/metadata/MetadataServiceNameMapping.java | 4 +--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/DefaultRegistryClusterIdentifier.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/DefaultRegistryClusterIdentifier.java index 42cc10b8f0e..56fa41fe482 100644 --- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/DefaultRegistryClusterIdentifier.java +++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/DefaultRegistryClusterIdentifier.java @@ -18,12 +18,13 @@ import org.apache.dubbo.common.URL; +import static org.apache.dubbo.common.constants.CommonConstants.DEFAULT_KEY; import static org.apache.dubbo.common.constants.RegistryConstants.REGISTRY_CLUSTER_KEY; public class DefaultRegistryClusterIdentifier implements RegistryClusterIdentifier { @Override public String providerKey(URL url) { - return url.getParameter(REGISTRY_CLUSTER_KEY); + return url.getParameter(REGISTRY_CLUSTER_KEY, DEFAULT_KEY); } @Override diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/MetadataServiceNameMapping.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/MetadataServiceNameMapping.java index b6d7a9c98ba..82a4815a014 100644 --- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/MetadataServiceNameMapping.java +++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/MetadataServiceNameMapping.java @@ -77,9 +77,7 @@ public Set getAndListen(URL url, MappingListener mappingListener) { protected String getRegistryCluster(URL url) { String registryCluster = RegistryClusterIdentifier.getExtension(url).providerKey(url); - if (registryCluster == null) { - registryCluster = DEFAULT_KEY; - } + int i = registryCluster.indexOf(","); if (i > 0) { registryCluster = registryCluster.substring(0, i); From 6f568af76eb94319a85e5de901895fb56785b94b Mon Sep 17 00:00:00 2001 From: xiaoheng1 <2018154970@qq.com> Date: Tue, 9 Mar 2021 22:28:00 +0800 Subject: [PATCH 2/2] delete useless imports. --- .../registry/client/metadata/MetadataServiceNameMapping.java | 1 - 1 file changed, 1 deletion(-) diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/MetadataServiceNameMapping.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/MetadataServiceNameMapping.java index 82a4815a014..4892b618eb1 100644 --- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/MetadataServiceNameMapping.java +++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/MetadataServiceNameMapping.java @@ -30,7 +30,6 @@ import java.util.Set; import static java.util.Arrays.asList; -import static org.apache.dubbo.common.constants.CommonConstants.DEFAULT_KEY; import static org.apache.dubbo.common.constants.CommonConstants.GROUP_KEY; import static org.apache.dubbo.common.constants.CommonConstants.VERSION_KEY; import static org.apache.dubbo.rpc.model.ApplicationModel.getName;