From b6ae49acd285f86bf5664ff14b6a87f7cbf0d224 Mon Sep 17 00:00:00 2001 From: hengyunabc Date: Thu, 20 Dec 2018 17:42:54 +0800 Subject: [PATCH] improve find tools.jar logic. fix #383 --- .../main/java/com/taobao/arthas/boot/ProcessUtils.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 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 4707984ef..da17a646a 100644 --- a/boot/src/main/java/com/taobao/arthas/boot/ProcessUtils.java +++ b/boot/src/main/java/com/taobao/arthas/boot/ProcessUtils.java @@ -150,7 +150,10 @@ public class ProcessUtils { String javaHome = System.getProperty("java.home"); if (JavaVersionUtils.isLessThanJava9()) { - File toolsJar = new File(javaHome, "../lib/tools.jar"); + File toolsJar = new File(javaHome, "lib/tools.jar"); + if (!toolsJar.exists()) { + toolsJar = new File(javaHome, "../lib/tools.jar"); + } if (!toolsJar.exists()) { // maybe jre toolsJar = new File(javaHome, "../../lib/tools.jar"); @@ -311,7 +314,10 @@ public class ProcessUtils { } String javaHome = findJavaHome(); - File toolsJar = new File(javaHome, "../lib/tools.jar"); + File toolsJar = new File(javaHome, "lib/tools.jar"); + if (!toolsJar.exists()) { + toolsJar = new File(javaHome, "../lib/tools.jar"); + } if (!toolsJar.exists()) { // maybe jre toolsJar = new File(javaHome, "../../lib/tools.jar");