Merge remote-tracking branch 'origin/GP-2979_Dan_GADPUseSameJava'

mquigley · Jan 19, 2023 · 5195aae · 5195aae
2 parents 4c65210 + 34aabc7
commit 5195aae
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/...gger-gadp/src/main/java/ghidra/dbg/gadp/server/AbstractGadpLocalDebuggerModelFactory.java b/...gger-gadp/src/main/java/ghidra/dbg/gadp/server/AbstractGadpLocalDebuggerModelFactory.java
@@ -113,8 +113,11 @@ public void run() {
 			try {
 				ProcessBuilder builder = new ProcessBuilder();
 				List<String> cmd = new ArrayList<>();
-				cmd.add("java");
-				cmd.addAll(List.of("-cp", System.getProperty("java.class.path")));
+				String javaCommand = System.getProperty("java.home") + File.separator + "bin" +
+					File.separator + "java";
+				cmd.add(javaCommand);
+				cmd.add("-cp");
+				cmd.add(System.getProperty("java.class.path"));
 				if (jdwpPort >= 0) {
 					cmd.add("-agentlib:jdwp=server=y,transport=dt_socket,address=" + jdwpPort +
 						",suspend=" + (jdwpSuspend ? "y" : "n"));