mirror/HMCL
2
0
Fork 0
mirror of https://github.com/HMCL-dev/HMCL.git synced 2025-02-11 16:59:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Suppress exceptions thrown when checking Java installation

Browse Source
This commit is contained in:
huanghongxun 2018-09-30 13:22:42 +08:00
parent 71a8fa0e66
commit 76ef47efc4
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
HMCLCore/src/main/java/org/jackhuang/hmcl/util/platform/JavaVersion.java
View File

@ -28,6 +28,7 @@ import java.nio.file.Paths;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Objects;
import java.util.concurrent.CountDownLatch; import java.util.concurrent.CountDownLatch;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.regex.Matcher; import java.util.regex.Matcher;
@ -231,18 +232,28 @@ public final class JavaVersion {
} }
// ==== // ====
private static JavaVersion fromJavaHomeQuietly(File home) {
try {
return fromJavaHome(home);
} catch (IOException e) {
Logging.LOG.log(Level.WARNING, "Couldn't determine java " + home, e);
return null;
}
}
// ==== OSX ==== // ==== OSX ====
private static List<JavaVersion> queryMacintosh() throws IOException { private static List<JavaVersion> queryMacintosh() {
List<JavaVersion> res = new ArrayList<>(); List<JavaVersion> res = new ArrayList<>();
File currentJRE = new File("/Library/Internet Plug-Ins/JavaAppletPlugin.plugin/Contents/Home"); File currentJRE = new File("/Library/Internet Plug-Ins/JavaAppletPlugin.plugin/Contents/Home");
if (currentJRE.exists()) if (currentJRE.exists())
res.add(fromJavaHome(currentJRE)); res.add(fromJavaHomeQuietly(currentJRE));
File[] files = new File("/Library/Java/JavaVirtualMachines/").listFiles(); File[] files = new File("/Library/Java/JavaVirtualMachines/").listFiles();
if (files != null) if (files != null)
for (File file : files) for (File file : files)
res.add(fromJavaHome(new File(file, "Contents/Home"))); res.add(fromJavaHomeQuietly(new File(file, "Contents/Home")));
res.removeIf(Objects::isNull);
return res; return res;
} }
// ==== // ====
@ -263,8 +274,10 @@ public final class JavaVersion {
if (!querySubFolders(java).contains(java + "\\MSI")) continue; if (!querySubFolders(java).contains(java + "\\MSI")) continue;
String home = queryRegisterValue(java, "JavaHome"); String home = queryRegisterValue(java, "JavaHome");
if (home != null) if (home != null)
res.add(fromJavaHome(new File(home))); res.add(fromJavaHomeQuietly(new File(home)));
} }
res.removeIf(Objects::isNull);
return res; return res;
} }