[#561][#650][#424][#541][#663][#672] add more tests

remkop · Apr 27, 2019 · e06f993 · e06f993
1 parent 02c4ea7
commit e06f993
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/main/java/picocli/CommandLine.java b/src/main/java/picocli/CommandLine.java
@@ -1690,7 +1690,7 @@ private int resolveExitCode(int exitCodeOnSuccess, R executionResult, List<IExit
             int result = exitCodeOnSuccess;
             for (IExitCodeGenerator generator : exitCodeGenerators) {
                 int exitCode = generator.getExitCode();
-                if ((exitCode > 0 && exitCode > exitCodeOnSuccess) || (exitCode < 0 && exitCode < exitCodeOnSuccess)) {
+                if ((exitCode > 0 && exitCode > result) || (exitCode < 0 && exitCode < result)) {
                     result = exitCode;
                 }
             }
@@ -1699,7 +1699,7 @@ private int resolveExitCode(int exitCodeOnSuccess, R executionResult, List<IExit
                 for (Object obj : resultList) {
                     if (obj instanceof Integer) {
                         Integer exitCode = (Integer) obj;
-                        if ((exitCode > 0 && exitCode > exitCodeOnSuccess) || (exitCode < 0 && exitCode < exitCodeOnSuccess)) {
+                        if ((exitCode > 0 && exitCode > result) || (exitCode < 0 && exitCode < result)) {
                             result = exitCode;
                         }
                     }