From 398b5e3b48874c77cc74c7db41628d1440cf6b0e Mon Sep 17 00:00:00 2001 From: Jon Marius Venstad Date: Mon, 21 Dec 2020 13:46:00 +0100 Subject: Use / as the default for no URI path --- .../src/main/java/com/yahoo/jdisc/application/UriPattern.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'jdisc_core/src/main/java/com/yahoo/jdisc') 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 { 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 { return 0; } - private static String nonNullOrBlank(String str) { - return str != null ? str : ""; - } - private static String nonNullOrWildcard(String val) { return val != null ? val : "*"; } -- cgit v1.2.3