From 6a89f0a661298e444361512fba5ab3cc646c1d36 Mon Sep 17 00:00:00 2001 From: yushijinhun Date: Thu, 7 Jun 2018 00:28:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E5=BD=93=E5=89=8DJava=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=8C=85=E5=90=AB=E5=9C=A8getJREs()=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/jackhuang/hmcl/util/JavaVersion.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/JavaVersion.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/JavaVersion.java index 036af9a88..31e438c69 100644 --- 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(); }