aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build/lib/sandbox
diff options
context:
space:
mode:
authorGravatar Dmitry Lomov <dslomov@google.com>2016-07-07 13:50:06 +0000
committerGravatar Yun Peng <pcloudy@google.com>2016-07-07 14:54:16 +0000
commit9bf3f6af2e42feb3ff7ef589b0d9570029bbab67 (patch)
treee9df963f80c4c497666c9e81cf958316c28e5bb1 /src/main/java/com/google/devtools/build/lib/sandbox
parent345e15e9f84c4ab21d26a51d8ed6e62f89210e78 (diff)
*** Reason for rollback *** Apparently we now try to open output files for the process twice: once when we are constructing the output streams, and the second time when we tell the process to redirect its outputs. This causes the outputs to be empty on Windows *** Original change description *** Do redirection of stdout / stderr in Java instead of reimplementing it in every process wrapper again. -- MOS_MIGRATED_REVID=126801016
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/sandbox')
-rw-r--r--src/main/java/com/google/devtools/build/lib/sandbox/NamespaceSandboxRunner.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/sandbox/NamespaceSandboxRunner.java b/src/main/java/com/google/devtools/build/lib/sandbox/NamespaceSandboxRunner.java
index b60f47dbfd..9516fe2753 100644
--- a/src/main/java/com/google/devtools/build/lib/sandbox/NamespaceSandboxRunner.java
+++ b/src/main/java/com/google/devtools/build/lib/sandbox/NamespaceSandboxRunner.java
@@ -190,8 +190,8 @@ public class NamespaceSandboxRunner {
cmd.execute(
/* stdin */ new byte[] {},
Command.NO_OBSERVER,
- outErr.getOutputFile(),
- outErr.getErrorFile(),
+ outErr.getOutputStream(),
+ outErr.getErrorStream(),
/* killSubprocessOnInterrupt */ true);
} catch (CommandException e) {
boolean timedOut = false;