fix for #4111 (#4114)

do not ignore empty value when we construct servicename
apache · May 22, 2019 · 10309b3 · 10309b3
1 parent 4785a27
commit 10309b3
Showing 1 changed file with 8 additions and 11 deletions.
diff --git a/...egistry-api/src/main/java/com/alibaba/dubbo/registry/support/ServiceInstanceRegistry.java b/...egistry-api/src/main/java/com/alibaba/dubbo/registry/support/ServiceInstanceRegistry.java
@@ -430,16 +430,19 @@ public static String getServiceName(URL url) {
 
     private static String getServiceName(URL url, String category) {
         StringBuilder serviceNameBuilder = new StringBuilder(category);
-        appendIfPresent(serviceNameBuilder, url, Constants.INTERFACE_KEY);
-        appendIfPresent(serviceNameBuilder, url, Constants.VERSION_KEY);
-        appendIfPresent(serviceNameBuilder, url, Constants.GROUP_KEY);
+        append(serviceNameBuilder, url, Constants.INTERFACE_KEY);
+        append(serviceNameBuilder, url, Constants.VERSION_KEY);
+        append(serviceNameBuilder, url, Constants.GROUP_KEY);
         return serviceNameBuilder.toString();
     }
 
-    private static void appendIfPresent(StringBuilder target, URL url,
+    private static void append(StringBuilder target, URL url,
                                         String parameterName) {
+        target.append(SERVICE_NAME_SEPARATOR);
         String parameterValue = url.getParameter(parameterName);
-        appendIfPresent(target, parameterValue);
+        if (StringUtils.isNotEmpty(parameterValue)) {
+            target.append(parameterValue);
+        }
     }
 
     public static String[] getServiceSegments(String serviceName) {
@@ -465,10 +468,4 @@ public static String getServiceGroup(String[] segments) {
     private static <T> T[] of(T... values) {
         return values;
     }
-
-    private static void appendIfPresent(StringBuilder target, String parameterValue) {
-        if (StringUtils.isNotEmpty(parameterValue)) {
-            target.append(SERVICE_NAME_SEPARATOR).append(parameterValue);
-        }
-    }
 }