summaryrefslogtreecommitdiffstats
path: root/jdisc_core
diff options
context:
space:
mode:
authorJon Marius Venstad <venstad@gmail.com>2020-12-21 13:37:47 +0100
committerJon Marius Venstad <venstad@gmail.com>2020-12-21 13:37:47 +0100
commitb23bc80bbccf443356993260d1384d9771ec0196 (patch)
tree06acedb40b8b1087afb1ed41ca2a871289cea8d3 /jdisc_core
parentfe4f6134ec7fa7f18eda03172e0fa3f430ec1409 (diff)
Require scheme in URI to match
Diffstat (limited to 'jdisc_core')
-rw-r--r--jdisc_core/src/main/java/com/yahoo/jdisc/application/UriPattern.java3
1 files changed, 2 insertions, 1 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 0a85bf6a403..89b6e0beeaf 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
@@ -108,7 +108,8 @@ public class UriPattern implements Comparable<UriPattern> {
if (hostMatch == null)
return null;
- GlobPattern.Match schemeMatch = scheme.match(normalizeScheme(nonNullOrBlank(uri.getScheme())));
+ GlobPattern.Match schemeMatch = uri.getScheme() == null ? null
+ : scheme.match(normalizeScheme(uri.getScheme()));
if (schemeMatch == null)
return null;