summaryrefslogtreecommitdiffstats
path: root/jdisc_core/src/main/java/com/yahoo/jdisc/application/UriPattern.java
diff options
context:
space:
mode:
Diffstat (limited to 'jdisc_core/src/main/java/com/yahoo/jdisc/application/UriPattern.java')
-rw-r--r--jdisc_core/src/main/java/com/yahoo/jdisc/application/UriPattern.java16
1 files changed, 1 insertions, 15 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 b6aebec4d8d..84a7e8066f9 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
@@ -100,7 +100,7 @@ public class UriPattern implements Comparable<UriPattern> {
if (pathMatch == null) {
return null;
}
- if (port > 0 && port != portOrSchemeDefault(uri)) {
+ if (port > 0 && port != uri.getPort()) {
return null;
}
// Match scheme before host because it has a higher chance of differing (e.g. http versus https)
@@ -171,20 +171,6 @@ public class UriPattern implements Comparable<UriPattern> {
return Integer.parseInt(str);
}
- private static int portOrSchemeDefault(URI uri) {
- int rawPort = uri.getPort();
- return rawPort != -1 ? rawPort : schemeDefaultPort(uri.getScheme());
- }
-
- private static int schemeDefaultPort(String scheme) {
- if (scheme == null) return -1;
- switch (scheme) {
- case "http": return 80;
- case "https": return 443;
- default: return -1;
- }
- }
-
private static String normalizeScheme(String scheme) {
if (scheme.equals("https")) return "http"; // handle 'https' in bindings and uris as 'http'
return scheme;