diff options
author | Jon Marius Venstad <venstad@gmail.com> | 2020-12-21 14:38:19 +0100 |
---|---|---|
committer | Jon Marius Venstad <venstad@gmail.com> | 2020-12-21 14:38:19 +0100 |
commit | 63cbc91356c14315bc1fb35758440d5a3b4ee3ce (patch) | |
tree | 91d2071a3c37e32b34d50383dfa1526a8344f2d4 /jdisc_core/src/main/java/com/yahoo | |
parent | c2c68ac0d453944ef81d04f442077f741d350011 (diff) |
Revert treating empty paths as "/"
Diffstat (limited to 'jdisc_core/src/main/java/com/yahoo')
-rw-r--r-- | jdisc_core/src/main/java/com/yahoo/jdisc/application/UriPattern.java | 8 |
1 files changed, 6 insertions, 2 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 058fa1f7772..85f6da45e2b 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 = uri.getRawPath() == null ? "/" : uri.getRawPath(); - GlobPattern.Match pathMatch = path.match(uriPath, 1); // Don't match the leading '/'. + String uriPath = nonNullOrBlank(uri.getPath()); + GlobPattern.Match pathMatch = path.match(uriPath, uriPath.startsWith("/") ? 1 : 0); if (pathMatch == null) return null; @@ -157,6 +157,10 @@ 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 : "*"; } |