From 23a4cefcc14a4f74491f51cd21b7ae2131a31f03 Mon Sep 17 00:00:00 2001 From: guaidaokakaxi Date: Thu, 14 Jan 2021 14:25:41 +0800 Subject: [PATCH] avoid repeated calls of method findJavaHome (#1667) --- boot/src/main/java/com/taobao/arthas/boot/ProcessUtils.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/boot/src/main/java/com/taobao/arthas/boot/ProcessUtils.java b/boot/src/main/java/com/taobao/arthas/boot/ProcessUtils.java index c892c5a4f..ce140820c 100644 --- a/boot/src/main/java/com/taobao/arthas/boot/ProcessUtils.java +++ b/boot/src/main/java/com/taobao/arthas/boot/ProcessUtils.java @@ -239,7 +239,7 @@ public class ProcessUtils { "Can not find java/java.exe executable file under java home: " + javaHome); } - File toolsJar = findToolsJar(); + File toolsJar = findToolsJar(javaHome); if (JavaVersionUtils.isLessThanJava9()) { if (toolsJar == null || !toolsJar.exists()) { @@ -388,12 +388,11 @@ public class ProcessUtils { return javaList.get(0); } - private static File findToolsJar() { + private static File findToolsJar(String javaHome) { if (JavaVersionUtils.isGreaterThanJava8()) { return null; } - String javaHome = findJavaHome(); File toolsJar = new File(javaHome, "lib/tools.jar"); if (!toolsJar.exists()) { toolsJar = new File(javaHome, "../lib/tools.jar");