AntPathMatcher#isPattern also checks URI vars

Closes gh-22959
This commit is contained in:
Rossen Stoyanchev
2019-05-23 09:54:45 -04:00
parent 5aa0de7ac8
commit 99302fd6bd
2 changed files with 27 additions and 3 deletions

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2018 the original author or authors.
* Copyright 2002-2019 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.
@@ -169,7 +169,21 @@ public class AntPathMatcher implements PathMatcher {
@Override
public boolean isPattern(String path) {
return (path.indexOf('*') != -1 || path.indexOf('?') != -1);
boolean uriVar = false;
for (int i = 0; i < path.length(); i++) {
char c = path.charAt(i);
if (c == '*' || c == '?') {
return true;
}
if (c == '{') {
uriVar = true;
continue;
}
if (c == '}' && uriVar) {
return true;
}
}
return false;
}
@Override