diff --git a/common/src/main/java/org/tron/core/config/Configuration.java b/common/src/main/java/org/tron/core/config/Configuration.java index 80735290b8..a36c982547 100644 --- a/common/src/main/java/org/tron/core/config/Configuration.java +++ b/common/src/main/java/org/tron/core/config/Configuration.java @@ -50,7 +50,7 @@ private static void resolveConfigFile(String fileName, File confFile) { if (confFile.exists()) { config = ConfigFactory.parseFile(confFile) .withFallback(ConfigFactory.defaultReference()); - } else if (Thread.currentThread().getContextClassLoader().getResourceAsStream(fileName) + } else if (Thread.currentThread().getContextClassLoader().getResource(fileName) != null) { config = ConfigFactory.load(fileName); } else { @@ -59,4 +59,3 @@ private static void resolveConfigFile(String fileName, File confFile) { } } } - diff --git a/framework/src/main/java/org/tron/core/config/args/Args.java b/framework/src/main/java/org/tron/core/config/args/Args.java index 0bca242606..0457dcb0dc 100644 --- a/framework/src/main/java/org/tron/core/config/args/Args.java +++ b/framework/src/main/java/org/tron/core/config/args/Args.java @@ -1186,9 +1186,8 @@ public String getOutputDirectory() { private static void printVersion() { Properties properties = new Properties(); boolean noGitProperties = true; - try { - InputStream in = Thread.currentThread() - .getContextClassLoader().getResourceAsStream("git.properties"); + try (InputStream in = Thread.currentThread() + .getContextClassLoader().getResourceAsStream("git.properties")) { if (in != null) { noGitProperties = false; properties.load(in); @@ -1276,9 +1275,8 @@ public static String upperFirst(String name) { private static String getCommitIdAbbrev() { Properties properties = new Properties(); - try { - InputStream in = Thread.currentThread() - .getContextClassLoader().getResourceAsStream("git.properties"); + try (InputStream in = Thread.currentThread() + .getContextClassLoader().getResourceAsStream("git.properties")) { if (in == null) { logger.warn("git.properties not found on classpath"); return ""; @@ -1315,4 +1313,3 @@ private static Map getOptionGroup() { return optionGroupMap; } } - diff --git a/framework/src/main/java/org/tron/core/zen/ZksnarkInitService.java b/framework/src/main/java/org/tron/core/zen/ZksnarkInitService.java index dfc4b42883..e0748e99f3 100644 --- a/framework/src/main/java/org/tron/core/zen/ZksnarkInitService.java +++ b/framework/src/main/java/org/tron/core/zen/ZksnarkInitService.java @@ -57,11 +57,14 @@ public static void librustzcashInitZksnarkParams() { } private static String getParamsFile(String fileName) { - InputStream in = Thread.currentThread().getContextClassLoader() - .getResourceAsStream("params" + File.separator + fileName); + String resourcePath = "params" + File.separator + fileName; File fileOut = new File(System.getProperty("java.io.tmpdir") + File.separator + fileName + "." + System.currentTimeMillis()); - try { + try (InputStream in = Thread.currentThread().getContextClassLoader() + .getResourceAsStream(resourcePath)) { + if (in == null) { + throw new IllegalStateException("Resource not found: " + resourcePath); + } FileUtils.copyToFile(in, fileOut); } catch (IOException e) { logger.error(e.getMessage(), e);