[dubbo] branch 3.2 updated: fix https://github.com/apache/dubbo/issues/12526 (#12527)

[albumenj]

This is an automated email from the ASF dual-hosted git repository.

albumenj pushed a commit to branch 3.2
in repository https://gitbox.apache.org/repos/asf/dubbo.git


The following commit(s) were added to refs/heads/3.2 by this push:
     new 467622aac6 fix https://github.com/apache/dubbo/issues/12526 (#12527)
467622aac6 is described below

commit 467622aac6b62408c1f5861ddec2880cd74e88cc
Author: Zhang Xiang Wei <zxw...@hotmail.com>
AuthorDate: Sun Jun 18 13:45:06 2023 +0800

    fix https://github.com/apache/dubbo/issues/12526 (#12527)
---
 .../src/main/java/org/apache/dubbo/config/ReferenceConfig.java      | 6 ++----
 .../src/main/java/org/apache/dubbo/config/ServiceConfig.java        | 6 ++----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git 
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ReferenceConfig.java
 
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ReferenceConfig.java
index 50bf549a20..e8da1c28d4 100644
--- 
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ReferenceConfig.java
+++ 
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ReferenceConfig.java
@@ -57,7 +57,7 @@ import org.apache.dubbo.rpc.support.ProtocolUtils;
 import java.beans.Transient;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Comparator;
+import java.util.TreeSet;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -409,9 +409,7 @@ public class ReferenceConfig<T> extends 
ReferenceConfigBase<T> {
                 logger.warn(CONFIG_NO_METHOD_FOUND, "", "", "No method found 
in service interface: " + interfaceClass.getName());
                 map.put(METHODS_KEY, ANY_VALUE);
             } else {
-                List<String> copyOfMethods = new 
ArrayList<>(Arrays.asList(methods));
-                copyOfMethods.sort(Comparator.naturalOrder());
-                map.put(METHODS_KEY, String.join(COMMA_SEPARATOR, 
copyOfMethods));
+                map.put(METHODS_KEY, StringUtils.join(new 
TreeSet<>(Arrays.asList(methods)), COMMA_SEPARATOR));
             }
         }
 
diff --git 
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java
 
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java
index 7fad3c8359..a382c2fdb4 100644
--- 
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java
+++ 
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java
@@ -57,7 +57,7 @@ import java.beans.Transient;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Comparator;
+import java.util.TreeSet;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -584,9 +584,7 @@ public class ServiceConfig<T> extends ServiceConfigBase<T> {
                 logger.warn(CONFIG_NO_METHOD_FOUND, "", "", "No method found 
in service interface: " + interfaceClass.getName());
                 map.put(METHODS_KEY, ANY_VALUE);
             } else {
-                List<String> copyOfMethods = new 
ArrayList<>(Arrays.asList(methods));
-                copyOfMethods.sort(Comparator.naturalOrder());
-                map.put(METHODS_KEY, String.join(COMMA_SEPARATOR, 
copyOfMethods));
+                map.put(METHODS_KEY, StringUtils.join(new 
TreeSet<>(Arrays.asList(methods)), COMMA_SEPARATOR));
             }
         }