Skip to content

Commit 10309b3

Browse files
uglycowmercyblitz
authored andcommitted
fix for #4111 (#4114)
do not ignore empty value when we construct servicename
1 parent 4785a27 commit 10309b3

File tree

1 file changed

+8
-11
lines changed

1 file changed

+8
-11
lines changed

dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/support/ServiceInstanceRegistry.java

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -430,16 +430,19 @@ public static String getServiceName(URL url) {
430430

431431
private static String getServiceName(URL url, String category) {
432432
StringBuilder serviceNameBuilder = new StringBuilder(category);
433-
appendIfPresent(serviceNameBuilder, url, Constants.INTERFACE_KEY);
434-
appendIfPresent(serviceNameBuilder, url, Constants.VERSION_KEY);
435-
appendIfPresent(serviceNameBuilder, url, Constants.GROUP_KEY);
433+
append(serviceNameBuilder, url, Constants.INTERFACE_KEY);
434+
append(serviceNameBuilder, url, Constants.VERSION_KEY);
435+
append(serviceNameBuilder, url, Constants.GROUP_KEY);
436436
return serviceNameBuilder.toString();
437437
}
438438

439-
private static void appendIfPresent(StringBuilder target, URL url,
439+
private static void append(StringBuilder target, URL url,
440440
String parameterName) {
441+
target.append(SERVICE_NAME_SEPARATOR);
441442
String parameterValue = url.getParameter(parameterName);
442-
appendIfPresent(target, parameterValue);
443+
if (StringUtils.isNotEmpty(parameterValue)) {
444+
target.append(parameterValue);
445+
}
443446
}
444447

445448
public static String[] getServiceSegments(String serviceName) {
@@ -465,10 +468,4 @@ public static String getServiceGroup(String[] segments) {
465468
private static <T> T[] of(T... values) {
466469
return values;
467470
}
468-
469-
private static void appendIfPresent(StringBuilder target, String parameterValue) {
470-
if (StringUtils.isNotEmpty(parameterValue)) {
471-
target.append(SERVICE_NAME_SEPARATOR).append(parameterValue);
472-
}
473-
}
474471
}

0 commit comments

Comments
 (0)