Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoakim Erdfelt2014-04-28 20:59:55 +0000
committerJoakim Erdfelt2014-04-28 20:59:55 +0000
commit1de043d6c3b95f50ab4f51c003ea5ed5606e8b02 (patch)
tree0c3439d6bfc4b263a80f624293c719123920d6af /jetty-start
parent609945fe7c6f0f5a48a77b3c77e31201d439fd37 (diff)
downloadorg.eclipse.jetty.project-1de043d6c3b95f50ab4f51c003ea5ed5606e8b02.tar.gz
org.eclipse.jetty.project-1de043d6c3b95f50ab4f51c003ea5ed5606e8b02.tar.xz
org.eclipse.jetty.project-1de043d6c3b95f50ab4f51c003ea5ed5606e8b02.zip
433563 - Jetty fails to startup on windows - InvalidPathException
+ Adjusted PathMatchers.isAbsolute() to only consider the search root, and not the whole path.
Diffstat (limited to 'jetty-start')
-rw-r--r--jetty-start/src/main/java/org/eclipse/jetty/start/PathMatchers.java9
1 files changed, 7 insertions, 2 deletions
diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/PathMatchers.java b/jetty-start/src/main/java/org/eclipse/jetty/start/PathMatchers.java
index 609c8b211a..58ce0ca975 100644
--- a/jetty-start/src/main/java/org/eclipse/jetty/start/PathMatchers.java
+++ b/jetty-start/src/main/java/org/eclipse/jetty/start/PathMatchers.java
@@ -47,7 +47,7 @@ public class PathMatchers
}
}
}
-
+
private static final char GLOB_CHARS[] = "*?".toCharArray();
private static final char SYNTAXED_GLOB_CHARS[] = "{}[]|:".toCharArray();
private static final Path EMPTY_PATH = new File(".").toPath();
@@ -167,7 +167,12 @@ public class PathMatchers
*/
public static boolean isAbsolute(final String pattern)
{
- return asPath(pattern).isAbsolute();
+ Path searchRoot = getSearchRoot(pattern);
+ if (searchRoot == EMPTY_PATH)
+ {
+ return false;
+ }
+ return searchRoot.isAbsolute();
}
/**

Back to the top