diff options
author | Jon Marius Venstad <venstad@gmail.com> | 2020-12-21 13:46:00 +0100 |
---|---|---|
committer | Jon Marius Venstad <venstad@gmail.com> | 2020-12-21 13:46:00 +0100 |
commit | 398b5e3b48874c77cc74c7db41628d1440cf6b0e (patch) | |
tree | e8e03f3524299a79140ee108ff898d4b00963668 /jdisc_core/src | |
parent | b23bc80bbccf443356993260d1384d9771ec0196 (diff) |
Use / as the default for no URI path
Diffstat (limited to 'jdisc_core/src')
-rw-r--r-- | jdisc_core/src/main/java/com/yahoo/jdisc/application/UriPattern.java | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/application/UriPattern.java b/jdisc_core/src/main/java/com/yahoo/jdisc/application/UriPattern.java index 89b6e0beeaf..edac56c72dd 100644 --- a/jdisc_core/src/main/java/com/yahoo/jdisc/application/UriPattern.java +++ b/jdisc_core/src/main/java/com/yahoo/jdisc/application/UriPattern.java @@ -98,8 +98,8 @@ public class UriPattern implements Comparable<UriPattern> { if (port > 0 && port != uri.getPort()) return null; - String uriPath = nonNullOrBlank(uri.getPath()); - GlobPattern.Match pathMatch = path.match(uriPath, uriPath.startsWith("/") ? 1 : 0); + String uriPath = uri.getPath() == null ? "/" : uri.getPath(); + GlobPattern.Match pathMatch = path.match(uriPath, 1); // Don't match the leading '/'. if (pathMatch == null) return null; @@ -157,10 +157,6 @@ public class UriPattern implements Comparable<UriPattern> { return 0; } - private static String nonNullOrBlank(String str) { - return str != null ? str : ""; - } - private static String nonNullOrWildcard(String val) { return val != null ? val : "*"; } |