From 1253272626a778377be80b0c9537ffd99e7dd6e0 Mon Sep 17 00:00:00 2001 From: Glavo Date: Wed, 23 Nov 2022 14:06:35 +0800 Subject: [PATCH] fix #1852: Lookup manifest in this jar (#1853) --- .../java/org/jackhuang/hmcl/util/io/JarUtils.java | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/io/JarUtils.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/io/JarUtils.java index 408372df1..bcaec07a0 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/io/JarUtils.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/io/JarUtils.java @@ -18,7 +18,6 @@ package org.jackhuang.hmcl.util.io; import java.io.IOException; -import java.io.InputStream; import java.net.URISyntaxException; import java.nio.file.FileSystemNotFoundException; import java.nio.file.Files; @@ -48,19 +47,7 @@ public final class JarUtils { }) .filter(Files::isRegularFile); - Manifest mf = null; - try (InputStream input = JarUtils.class.getResourceAsStream("/META-INF/MANIFEST.MF")) { - if (input != null) - mf = new Manifest(input); - } catch (IOException e) { - // Logger has not started - e.printStackTrace(); - } - - if (mf == null) - mf = THIS_JAR.flatMap(JarUtils::getManifest).orElseGet(Manifest::new); - - manifest = mf; + manifest = THIS_JAR.flatMap(JarUtils::getManifest).orElseGet(Manifest::new); } public static Optional thisJar() {