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

Direct matches by URL path work again

Browse Source 
This commit fixes a recent regression as a result of 5225a57411
with the determination of non-pattern vs pattern URLs. That in turn affects the ability to perform
direct matches by URL path.

There is also a fix in PathPattern to recognize "catch-all" patterns as pattern syntax.

See gh-24945
This commit is contained in:
Rossen Stoyanchev
2020-06-24 08:07:01 +01:00
parent 7e71749e34
commit 57f868fcbd
6 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/PathPatternsRequestCondition.java
View File

@@ -129,7 +129,7 @@ public final class PathPatternsRequestCondition extends AbstractRequestCondition
}
Set<String> result = Collections.emptySet();
for (PathPattern pattern : this.patterns) {
if (pattern.hasPatternSyntax()) {
if (!pattern.hasPatternSyntax()) {
result = (result.isEmpty() ? new HashSet<>(1) : result);
result.add(pattern.getPatternString());
}

2
spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/PatternsRequestCondition.java
View File

@@ -218,7 +218,7 @@ public class PatternsRequestCondition extends AbstractRequestCondition<PatternsR
}
Set<String> result = Collections.emptySet();
for (String pattern : this.patterns) {
if (this.pathMatcher.isPattern(pattern)) {
if (!this.pathMatcher.isPattern(pattern)) {
result = (result.isEmpty() ? new HashSet<>(1) : result);
result.add(pattern);
}