From 1693df214b1aefeac05ffeb834460bceac0fa3b4 Mon Sep 17 00:00:00 2001 From: "ken.lj" Date: Mon, 28 Sep 2020 17:07:34 +0800 Subject: [PATCH] Fix service instance equals (#6787) --- .../java/org/apache/dubbo/metadata/ServiceNameMapping.java | 6 ------ .../dubbo/registry/client/DefaultServiceInstance.java | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/ServiceNameMapping.java b/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/ServiceNameMapping.java index 58cd87d6c4..074080f520 100644 --- a/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/ServiceNameMapping.java +++ b/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/ServiceNameMapping.java @@ -70,10 +70,4 @@ public interface ServiceNameMapping { return DEFAULT_MAPPING_GROUP + SLASH + serviceInterface; } - static class MappingException extends RuntimeException { - public MappingException(String message) { - super(message); - } - } - } diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/DefaultServiceInstance.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/DefaultServiceInstance.java index eb581f945c..ff6af6673d 100644 --- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/DefaultServiceInstance.java +++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/DefaultServiceInstance.java @@ -184,7 +184,7 @@ public class DefaultServiceInstance implements ServiceInstance { if (entry.getKey().equals(REVISION_KEY)) { continue; } - equals = equals && !entry.getValue().equals(that.getMetadata().get(entry.getKey())); + equals = equals && entry.getValue().equals(that.getMetadata().get(entry.getKey())); } return equals;