MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-13 21:55:01 +07:00
Code Issues Packages Projects Releases Wiki Activity

[java] anticipates jrt-fs.jar move

Browse Source
This commit is contained in:
Roman Shevchenko
2016-11-17 16:47:31 +01:00
parent 0f18327d65
commit 502f712fc6
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/openapi/vfs/impl/jrt/JrtHandler.java
+2 -1
View File
@@ -51,7 +51,8 @@ class JrtHandler extends ArchiveHandler {
fs = FileSystems.newFileSystem(ROOT_URI, Collections.singletonMap("java.home", path));
}
else {
File file = new File(path, "jrt-fs.jar");
File file = new File(path, "lib/jrt-fs.jar");
if (!file.exists()) file = new File(path, "jrt-fs.jar");
if (!file.exists()) throw new IOException("Missing provider: " + file);
URL url = file.toURI().toURL();
ClassLoader loader = new URLClassLoader(new URL[]{url}, null);
java/openapi/src/com/intellij/openapi/vfs/jrt/JrtFileSystem.java
+1 -1
View File
@@ -36,7 +36,7 @@ public abstract class JrtFileSystem extends ArchiveFileSystem {
}
public static boolean isModularJdk(@NotNull String homePath) {
return new File(homePath, "lib/modules").exists() && new File(homePath, "jrt-fs.jar").isFile();
return new File(homePath, "lib/jrt-fs.jar").isFile() || new File(homePath, "jrt-fs.jar").isFile();
}
public static boolean isRoot(@NotNull VirtualFile file) {