From 8b224cb2405d28c784111c052fcf1147865ceddf Mon Sep 17 00:00:00 2001 From: Glavo Date: Sat, 23 Oct 2021 21:35:37 +0800 Subject: [PATCH] Avoid throwing NPE when the Java version cannot be obtained --- .../org/jackhuang/hmcl/util/platform/JavaVersion.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/platform/JavaVersion.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/platform/JavaVersion.java index 6c165f2ab..04db83752 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/platform/JavaVersion.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/platform/JavaVersion.java @@ -54,8 +54,14 @@ public final class JavaVersion { this.binary = binary; this.longVersion = longVersion; this.platform = platform; - version = parseVersion(longVersion); - versionNumber = VersionNumber.asVersion(longVersion); + + if (longVersion != null) { + version = parseVersion(longVersion); + versionNumber = VersionNumber.asVersion(longVersion); + } else { + version = UNKNOWN; + versionNumber = null; + } } public Path getBinary() {