lan/HMCL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复在精简 JRE 上崩溃的问题 (#1893)

Browse Source 
* Do not load javafx.web on unsupported platforms

* No longer requires jdk.zipfs to exist
This commit is contained in:
Glavo
2022-12-02 17:23:08 +08:00
committed by GitHub
parent 9e2c46a6f8
commit d4c0c30283
2 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
HMCLCore/src/main/java/org/jackhuang/hmcl/util/io/CompressingUtils.java
View File

@@ -19,6 +19,7 @@ package org.jackhuang.hmcl.util.io;
import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
import org.apache.commons.compress.archivers.zip.ZipFile;
import org.jackhuang.hmcl.util.Lang;
import org.jackhuang.hmcl.util.platform.OperatingSystem;
import java.io.File;
@@ -43,7 +44,7 @@ public final class CompressingUtils {
private static final FileSystemProvider ZIPFS_PROVIDER = FileSystemProvider.installedProviders().stream()
.filter(it -> "jar".equalsIgnoreCase(it.getScheme()))
.findFirst()
.orElseThrow(() -> new IllegalStateException("Zipfs not supported"));
.orElse(null);
private CompressingUtils() {
}
@@ -197,6 +198,9 @@ public final class CompressingUtils {
if (useTempFile)
env.put("useTempFile", true);
try {
if (ZIPFS_PROVIDER == null)
throw new FileSystemNotFoundException("Module jdk.zipfs does not exist");
return ZIPFS_PROVIDER.newFileSystem(zipFile, env);
} catch (ZipError error) {
// Since Java 8 throws ZipError stupidly
@@ -204,7 +208,7 @@ public final class CompressingUtils {
} catch (UnsupportedOperationException ex) {
throw new ZipException("Not a zip file");
} catch (FileSystemNotFoundException ex) {
throw new ZipException("Java Environment is broken");
throw Lang.apply(new ZipException("Java Environment is broken"), it -> it.initCause(ex));
}
}