SystemRegistryImpl: fixed NPE

jline · May 9, 2020 · b695c9b · b695c9b
1 parent 1a9ee1b
commit b695c9b
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/builtins/src/main/java/org/jline/builtins/SystemRegistryImpl.java b/builtins/src/main/java/org/jline/builtins/SystemRegistryImpl.java
@@ -1099,12 +1099,8 @@ private Object execute(String command, String rawLine, String[] args) throws Exc
         } else {
             int id = registryId(command);
             if (id > -1) {
-                if (consoleId != null) {
-                    out = commandRegistries[id].invoke(outputStream.getCommandSession(), command,
-                            consoleEngine().expandParameters(args));
-                } else {
-                    out = commandRegistries[id].execute(outputStream.getCommandSession(), command, args);
-                }
+                Object[] _args = consoleId != null ? consoleEngine().expandParameters(args) : (Object[])args;
+                out = commandRegistries[id].invoke(outputStream.getCommandSession(), command, _args);
             } else if (scriptStore.hasScript(command)) {
                 out = consoleEngine().execute(command, rawLine, args);
             } else {