Skip to content

Commit

Permalink
Merge pull request #1386 from hcoles/feature/escape_inherited_spaces
Browse files Browse the repository at this point in the history
escape spaces in inherited agents and variables
  • Loading branch information
hcoles authored Feb 12, 2025
2 parents b93ef78 + 4e7ff00 commit c0963cb
Showing 1 changed file with 2 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ private ProcessBuilder createProcessBuilder(String javaProc,

List<String> cmd = new ArrayList<>();
cmd.add(javaProc);
addLaunchJavaAgentsAndEnvironmentVariables(cmd);
cmd.add("@" + argsFile.toFile().getAbsolutePath());
cmd.add(mainClass.getName());
cmd.add(programArgs);
Expand Down Expand Up @@ -113,8 +114,6 @@ private List<String> createLaunchArgs(JavaAgent agentJarLocator, List<String> ar

cmd.addAll(args);

addLaunchJavaAgents(cmd);

return cmd;
}

Expand All @@ -139,7 +138,7 @@ private static void addPITJavaAgent(JavaAgent agentJarLocator,
jarLocation.ifPresent(l -> cmd.add("-javaagent:" + l));
}

private static void addLaunchJavaAgents(List<String> cmd) {
private static void addLaunchJavaAgentsAndEnvironmentVariables(List<String> cmd) {
RuntimeMXBean rt = ManagementFactory.getRuntimeMXBean();
List<String> agents = rt.getInputArguments().stream()
.filter(isJavaAgentParam().or(isEnvironmentSetting()))
Expand Down

0 comments on commit c0963cb

Please sign in to comment.