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 : "*";
     }