From f8df0cbf5997464b6383143ea0d4e88d776154d8 Mon Sep 17 00:00:00 2001
From: "ken.lj" <ken.lj.hz@gmail.com>
Date: Fri, 6 Nov 2020 14:30:30 +0800
Subject: [PATCH] Use TreeMap to cal revision (#6869)

* remove not used classes.

* support service discovery unsubscribe and re-refer

* add publishInterface config item to ApplicationConfig

* remove useless class definition

* fix service instance equals bug

* use ordered treemap to cal revision.
---
 .../main/java/org/apache/dubbo/metadata/MetadataInfo.java    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/MetadataInfo.java b/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/MetadataInfo.java
index f2d20f5b48..4a9ea6ff61 100644
--- a/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/MetadataInfo.java
+++ b/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/MetadataInfo.java
@@ -31,6 +31,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.SortedSet;
+import java.util.TreeMap;
 import java.util.TreeSet;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -97,7 +98,7 @@ public class MetadataInfo implements Serializable {
 
         StringBuilder sb = new StringBuilder();
         sb.append(app);
-        for (Map.Entry<String, ServiceInfo> entry : services.entrySet()) {
+        for (Map.Entry<String, ServiceInfo> entry : new TreeMap<>(services).entrySet()) {
             sb.append(entry.getValue().toDescString());
         }
         this.revision = RevisionResolver.calRevision(sb.toString());
@@ -365,7 +366,7 @@ public class MetadataInfo implements Serializable {
         }
 
         public String toDescString() {
-            return this.getMatchKey() + getMethodSignaturesString() + getParams();
+            return this.getMatchKey() + getMethodSignaturesString() + new TreeMap<>(getParams());
         }
 
         private String getMethodSignaturesString() {