Merge pull request #5304 from vespa-engine/hmusum/exit-code-0-if-help-option-used

Do not return with exit code 1 if help option is used

1 files changed, 7 insertions, 1 deletions

diff --git a/vespaclient-java/src/main/java/com/yahoo/dummyreceiver/DummyReceiver.java b/vespaclient-java/src/main/java/com/yahoo/dummyreceiver/DummyReceiver.java
index e6c644353ad..f8b785fd4e3 100755
--- a/vespaclient-java/src/main/java/com/yahoo/dummyreceiver/DummyReceiver.java
+++ b/vespaclient-java/src/main/java/com/yahoo/dummyreceiver/DummyReceiver.java
@@ -44,6 +44,7 @@ public class DummyReceiver implements MessageHandler {
     long maxQueueTime = -1;
     BlockingQueue<Runnable> queue;
     boolean verbose = false;
+    private boolean helpOption = false;
 
     DummyReceiver() {
     }
@@ -144,6 +145,7 @@ public class DummyReceiver implements MessageHandler {
 
                 if (arg.equals("-h") || arg.equals("--help")) {
                     help();
+                    helpOption = true;
                     return false;
                 } else if ("--name".equals(arg)) {
                     name = getParam(args, arg);
@@ -161,6 +163,7 @@ public class DummyReceiver implements MessageHandler {
                     verbose = true;
                 } else {
                     help();
+                    helpOption = true;
                     return false;
                 }
             }
@@ -180,9 +183,12 @@ public class DummyReceiver implements MessageHandler {
         for (String arg : args) {
             l.add(arg);
         }
-        if (!rcv.parseArgs(l)) {
+        if (!rcv.parseArgs(l) && !rcv.helpOption) {
             System.exit(1);
         }
+        if (rcv.helpOption) {
+            System.exit(0); // exit with success instead of returning
+        }
 
         rcv.init();
         while (true) {