From 4fe55e2ae4a73ba9fc24dc2dc73f44cd9f8d48fa Mon Sep 17 00:00:00 2001 From: Greg Wilkins Date: Tue, 26 Apr 2022 14:11:44 +0200 Subject: [PATCH] Fix #7918 Root path spec cleaner logic Signed-off-by: Greg Wilkins --- .../org/eclipse/jetty/http/pathmap/PathMappings.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/jetty-http/src/main/java/org/eclipse/jetty/http/pathmap/PathMappings.java b/jetty-http/src/main/java/org/eclipse/jetty/http/pathmap/PathMappings.java index fbc9db0bf740..ed7f83b354ff 100644 --- a/jetty-http/src/main/java/org/eclipse/jetty/http/pathmap/PathMappings.java +++ b/jetty-http/src/main/java/org/eclipse/jetty/http/pathmap/PathMappings.java @@ -199,12 +199,12 @@ public Iterator> iterator() public static PathSpec asPathSpec(String pathSpecString) { - if ((pathSpecString == null) || (pathSpecString.length() < 1)) - { - if (pathSpecString != null) - return new ServletPathSpec(""); + if (pathSpecString == null) throw new RuntimeException("Path Spec String must start with '^', '/', or '*.': got [" + pathSpecString + "]"); - } + + if (pathSpecString.length() == 0) + return new ServletPathSpec(""); + return pathSpecString.charAt(0) == '^' ? new RegexPathSpec(pathSpecString) : new ServletPathSpec(pathSpecString); }