Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MetadataEncoder expands vars correctly

Browse Source 
Closes gh-24656
This commit is contained in:
Rossen Stoyanchev
2020-03-10 13:59:19 +00:00
parent 0dc1c7eb8b
commit 4aedf2ea13
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-messaging/src/main/java/org/springframework/messaging/rsocket/MetadataEncoder.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2020 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -51,7 +51,7 @@ import org.springframework.util.ObjectUtils;
final class MetadataEncoder {
/** For route variable replacement. */
private static final Pattern VARS_PATTERN = Pattern.compile("\\{([^/]+?)}");
private static final Pattern VARS_PATTERN = Pattern.compile("\\{(.+?)}");
private static final Object NO_VALUE = new Object();
@@ -113,6 +113,7 @@ final class MetadataEncoder {
matcher.appendReplacement(sb, value);
index++;
}
matcher.appendTail(sb);
return sb.toString();
}