Fix program crash when try to show command helper info (project-chip#…

…24809)
lecndav · Mar 22, 2023 · 8c84870 · 8c84870
1 parent c260cbd
commit 8c84870
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/examples/java-matter-controller/java/src/com/matter/controller/Main.java b/examples/java-matter-controller/java/src/com/matter/controller/Main.java
@@ -112,9 +112,6 @@ public static void main(String[] args) {
 
     try {
       commandManager.run(args);
-    } catch (IllegalArgumentException e) {
-      logger.log(Level.INFO, "Arguments init failed with exception: " + e.getMessage());
-      System.exit(1);
     } catch (Exception e) {
       logger.log(Level.INFO, "Run command failed with exception: " + e.getMessage());
       System.exit(1);

diff --git a/...java-matter-controller/java/src/com/matter/controller/commands/common/CommandManager.java b/...java-matter-controller/java/src/com/matter/controller/commands/common/CommandManager.java
@@ -96,8 +96,14 @@ public final void run(String[] args) throws Exception {
     // need skip over binary and command name and only get arguments
     String[] temp = Arrays.copyOfRange(args, 2, args.length);
 
-    command.initArguments(temp.length, temp);
-    showCommand(args[0], command);
+    try {
+      command.initArguments(temp.length, temp);
+    } catch (IllegalArgumentException e) {
+      logger.log(Level.INFO, "Arguments init failed with exception: " + e.getMessage());
+      showCommand(args[0], command);
+      System.exit(1);
+    }
+
     command.run();
   }