commit 9bf3f6af2e42feb3ff7ef589b0d9570029bbab67
author Dmitry Lomov <dslomov@google.com> Thu Jul 07 13:50:06 2016 +0000
committer Yun Peng <pcloudy@google.com> Thu Jul 07 14:54:16 2016 +0000
tree e9df963f80c4c497666c9e81cf958316c28e5bb1
parent 345e15e9f84c4ab21d26a51d8ed6e62f89210e78

Rollback of commit 1e37a5375f918376c132fa537e25695f673f41b8.

*** 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

src/main/java/com/google/devtools/build/lib/shell/Command.java

diff --git a/src/main/java/com/google/devtools/build/lib/shell/Command.java b/src/main/java/com/google/devtools/build/lib/shell/Command.java
index 8d40c15..84f78d2 100644
--- a/src/main/java/com/google/devtools/build/lib/shell/Command.java
+++ b/src/main/java/com/google/devtools/build/lib/shell/Command.java
@@ -410,10 +410,12 @@
   }
 
   /**
-   * Like {@link #execute(byte[], KillableObserver, OutputStream, OutputStream, boolean)} but allows
-   * using files to redirect stdOut and stdErr. This gives better performance as the data doesn't
-   * flow through the JVM but instead is written directly to the corresponding file descriptors by
-   * the process.
+   * Execute this command with given input to stdin; this stream is closed when the process
+   * terminates, and exceptions raised when closing this stream are ignored. This call blocks until
+   * the process completes or an error occurs. The caller provides {@link OutputStream} instances
+   * into which the process writes its stdout/stderr output; these streams are <em>not</em> closed
+   * when the process terminates. The given {@link KillableObserver} may also terminate the process
+   * early while running.
    *
    * <p>If stdOut or stdErr is {@code null}, it will be redirected to /dev/null.
    */
@@ -680,12 +682,10 @@
 
     final Subprocess process = startProcess();
 
-    if (outErrConsumers != null) {
-      outErrConsumers.logConsumptionStrategy();
+    outErrConsumers.logConsumptionStrategy();
 
-      outErrConsumers.registerInputs(
-          process.getInputStream(), process.getErrorStream(), closeOutputStreams);
-    }
+    outErrConsumers.registerInputs(
+        process.getInputStream(), process.getErrorStream(), closeOutputStreams);
 
     processInput(stdinInput, process);
 
@@ -826,12 +826,10 @@
     log.finer(status.toString());
 
     try {
-      if (outErr != null) {
-        if (Thread.currentThread().isInterrupted()) {
-          outErr.cancel();
-        } else {
-          outErr.waitForCompletion();
-        }
+      if (Thread.currentThread().isInterrupted()) {
+        outErr.cancel();
+      } else {
+        outErr.waitForCompletion();
       }
     } catch (IOException ioe) {
       CommandResult noOutputResult =
@@ -854,10 +852,7 @@
     }
 
     CommandResult result =
-        new CommandResult(
-            outErr != null ? outErr.getAccumulatedOut() : CommandResult.NO_OUTPUT_COLLECTED,
-            outErr != null ? outErr.getAccumulatedErr() : CommandResult.NO_OUTPUT_COLLECTED,
-            status);
+        new CommandResult(outErr.getAccumulatedOut(), outErr.getAccumulatedErr(), status);
     result.logThis();
     if (status.success()) {
       return result;