|
|
@ -195,8 +195,7 @@ public final class RequestMappingInfo implements RequestCondition<RequestMapping |
|
|
|
@Nullable |
|
|
|
@Nullable |
|
|
|
private String combineNames(RequestMappingInfo other) { |
|
|
|
private String combineNames(RequestMappingInfo other) { |
|
|
|
if (this.name != null && other.name != null) { |
|
|
|
if (this.name != null && other.name != null) { |
|
|
|
String separator = "#"; |
|
|
|
return this.name + "#" + other.name; |
|
|
|
return this.name + separator + other.name; |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
else if (this.name != null) { |
|
|
|
else if (this.name != null) { |
|
|
|
return this.name; |
|
|
|
return this.name; |
|
|
|