Disregard Java runtimes that don't have a bin folder

joshricker · Apr 23, 2022 · 8e1337d · 8e1337d
1 parent 3c4c38e
commit 8e1337d
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/launcher/src/main/java/com/skcraft/launcher/launch/runtime/JavaRuntimeFinder.java b/launcher/src/main/java/com/skcraft/launcher/launch/runtime/JavaRuntimeFinder.java
@@ -43,6 +43,7 @@ public static List<JavaRuntime> getAvailableRuntimes() {
         // Add system Javas
         runtimeFinder.getCandidateJavaLocations().stream()
                 .map(JavaRuntimeFinder::getRuntimeFromPath)
+                .filter(Objects::nonNull)
                 .forEach(entries::add);
 
         // Add extra runtimes
@@ -95,6 +96,11 @@ public static JavaRuntime getRuntimeFromPath(File target) {
             binFolder = new File(target, "jre/bin");
         }
 
+        if (!binFolder.isDirectory()) {
+            // No bin folder, this isn't a usable install
+            return null;
+        }
+
         JavaReleaseFile release = JavaReleaseFile.parseFromRelease(releaseFile.getParentFile());
         if (release == null) {
             // Make some assumptions...