Return a result even if the exit code isn't in the set of successful values.

1 files changed, 7 insertions, 1 deletions

diff --git a/vespajlib/src/main/java/com/yahoo/system/execution/ProcessExecutor.java b/vespajlib/src/main/java/com/yahoo/system/execution/ProcessExecutor.java
index 2837372820b..17d0e4c0caa 100644
--- a/vespajlib/src/main/java/com/yahoo/system/execution/ProcessExecutor.java
+++ b/vespajlib/src/main/java/com/yahoo/system/execution/ProcessExecutor.java
@@ -3,6 +3,7 @@ package com.yahoo.system.execution;
 
 import org.apache.commons.exec.CommandLine;
 import org.apache.commons.exec.DefaultExecutor;
+import org.apache.commons.exec.ExecuteException;
 import org.apache.commons.exec.ExecuteWatchdog;
 import org.apache.commons.exec.PumpStreamHandler;
 
@@ -73,7 +74,12 @@ public class ProcessExecutor {
         executor.setWatchdog(watchDog);
         executor.setExitValues(successExitCodes);
 
-        int exitCode = executor.execute(CommandLine.parse(command));
+         int exitCode;
+         try {
+             exitCode = executor.execute(CommandLine.parse(command));
+         } catch (ExecuteException e) {
+             exitCode = e.getExitValue();
+         }
         return (watchDog.killedProcess()) ?
                 Optional.empty() : Optional.of(new ProcessResult(exitCode, processOut.toString(), processErr.toString()));
     }