Commit 44f4be8f authored by sml's avatar sml

submit

parent 803ec9cf
Pipeline #363 failed with stages
...@@ -119,11 +119,12 @@ public abstract class AbstractCommandExecutor { ...@@ -119,11 +119,12 @@ public abstract class AbstractCommandExecutor {
if (OSUtils.isWindows()) { if (OSUtils.isWindows()) {
//init process builder //init process builder
ProcessBuilderForWin32 processBuilder = new ProcessBuilderForWin32(); //ProcessBuilderForWin32 processBuilder = new ProcessBuilderForWin32();
ProcessBuilder processBuilder = new ProcessBuilder();
// setting up a working directory // setting up a working directory
processBuilder.directory(new File(taskExecutionContext.getExecutePath())); processBuilder.directory(new File(taskExecutionContext.getExecutePath()));
// setting up a username and password // setting up a username and password
processBuilder.user(taskExecutionContext.getTenantCode(), StringUtils.EMPTY); //processBuilder.user(taskExecutionContext.getTenantCode(), StringUtils.EMPTY);
// merge error information to standard output stream // merge error information to standard output stream
processBuilder.redirectErrorStream(true); processBuilder.redirectErrorStream(true);
...@@ -508,8 +509,11 @@ public abstract class AbstractCommandExecutor { ...@@ -508,8 +509,11 @@ public abstract class AbstractCommandExecutor {
f.setAccessible(true); f.setAccessible(true);
if (OSUtils.isWindows()) { if (OSUtils.isWindows()) {
WinNT.HANDLE handle = (WinNT.HANDLE) f.get(process); //WinNT.HANDLE handle = (WinNT.HANDLE) f.get(process);
processId = Kernel32.INSTANCE.GetProcessId(handle); //processId = Kernel32.INSTANCE.GetProcessId(handle);
//processId = f.getInt(process);
Long processIds = f.getLong(process);
processId = processIds.intValue();
} else { } else {
processId = f.getInt(process); processId = f.getInt(process);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment