You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by li...@apache.org on 2020/09/28 09:07:50 UTC
[dubbo] branch 3.0 updated: Fix service instance equals (#6787)
This is an automated email from the ASF dual-hosted git repository.
liujun 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 1693df2 Fix service instance equals (#6787)
1693df2 is described below
commit 1693df214b1aefeac05ffeb834460bceac0fa3b4
Author: ken.lj <ke...@gmail.com>
AuthorDate: Mon Sep 28 17:07:34 2020 +0800
Fix service instance equals (#6787)
---
.../src/main/java/org/apache/dubbo/metadata/ServiceNameMapping.java | 6 ------
.../org/apache/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 58cd87d..074080f 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 eb581f9..ff6af66 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;