Merge pull request #445 from dmlloyd/process

Avoid NPE when error is redirected to output

Author: dmlloyd

process/src/main/java/io/smallrye/common/process/PipelineRunner.java

@@ -114,6 +114,8 @@ int createInputThread(ThreadFactory tf, ProcessRunner<?> runner) throws IOExcept
     int createErrorThreads(ThreadFactory tf, ProcessRunner<?> runner) throws IOException {
         int strategy = processBuilder.errorStrategy;
         if (strategy == ERR_REDIRECT) {
+            processBuilder.errorGatherOnFail = false;
+            processBuilder.errorLogOnSuccess = false;
             pb.redirectErrorStream(true);
             return 0;
         }

process/src/main/java/io/smallrye/common/process/ProcessRunner.java

@@ -104,6 +104,7 @@ private void initialize(final ThreadFactory tf) {
             throw new PipelineExecutionException("Failed to create process thread(s)", e);
         }
         try {
+            taskCount = taskCnt;
             startThreads();
         } catch (Throwable t) {
             status = STATUS_FAILED;
@@ -120,7 +121,6 @@ private void initialize(final ThreadFactory tf) {
                 processes.forEach(ProcessUtil::destroyAllForcibly);
                 throw t;
             }
-            taskCount = taskCnt;
         } catch (Throwable t) {
             status = STATUS_FAILED;
             unpark();

process/src/test/java/io/smallrye/common/process/TestBasicExecution.java

@@ -1,6 +1,7 @@
 package io.smallrye.common.process;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
 
@@ -232,6 +233,17 @@ public void testWorkingDirectory() throws Exception {
                 .run());
     }
 
+    @Test
+    public void testNullPointerOnRedirect() throws Exception {
+        assertThrows(AbnormalExitException.class, () -> {
+            ProcessBuilder.newBuilder(ProcessUtil.pathOfJava())
+                    .arguments(findHelper(ErrorifierWithOutput.class, "1"))
+                    .output().gatherOnFail(true).inherited()
+                    .error().gatherOnFail(true).redirect()
+                    .run();
+        });
+    }
+
     @Test
     public void testFormatInfiniteLoop() {
         // just make sure it doesn't infinitely loop