将当前Java版本包含在getJREs()中

2018-06-07 00:28:33 +08:00
parent 3a9efdb03e
commit 6a89f0a661
1 changed files with 13 additions and 0 deletions
--- a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/JavaVersion.java
+++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/JavaVersion.java
@@ -190,6 +190,19 @@ public final class JavaVersion implements Serializable {
                javaVersions = Collections.emptyList();
                break;
        }
+
+        boolean isCurrentJavaIncluded = false;
+        for (int i = 0; i < javaVersions.size(); i++) {
+            if (THIS_JAVA.getBinary().equals(javaVersions.get(i).getBinary())) {
+                javaVersions.set(i, THIS_JAVA);
+                isCurrentJavaIncluded = true;
+                break;
+            }
+        }
+        if (!isCurrentJavaIncluded) {
+            javaVersions.add(THIS_JAVA);
+        }
+
        JAVAS = Collections.unmodifiableList(javaVersions);
        LATCH.countDown();
    }