8224908: Revert: 8216553: JrtFileSystemProvider getPath(URI) omits /modules element from file path

Reviewed-by: darcy, kbarrett
This commit is contained in:
Jim Laskey 2019-05-28 16:51:28 -03:00
parent b71c30f1b8
commit 4e83c1c4dc
4 changed files with 7 additions and 61 deletions

View file

@ -377,9 +377,9 @@ public class JarTask extends AbstractTask<JarTask> {
private final Pattern jarEntry = Pattern.compile(".*!/(?:META-INF/sym/[^/]+/)?(.*)");
/*
* A jrt: URL is of the form jrt:/<module>/<package>/<file>
* A jrt: URL is of the form jrt:/modules/<module>/<package>/<file>
*/
private final Pattern jrtEntry = Pattern.compile("/([^/]+)/(.*)");
private final Pattern jrtEntry = Pattern.compile("/modules/([^/]+)/(.*)");
/*
* A file: URL is of the form file:/path/to/{modules,patches}/<module>/<package>/<file>