Caught JLine sneaky throw properly.

payara · Aug 12, 2019 · 5b82eae · 5b82eae · dmatej · Aug 13, 2019
1 parent e874701
commit 5b82eae
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/...server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/cli/LocalServerCommand.java b/...server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/cli/LocalServerCommand.java
@@ -579,8 +579,12 @@ private String retry(int times) throws CommandException {
             try {
                 char[] mpvArr = super.readPassword(prompt);
                 mpv = mpvArr != null ? new String(mpvArr) : null;
-            } catch (Throwable t) {
-                throw new CommandException(STRINGS.get("no.console"), t);
+            } catch (Exception ex) {
+                // JLine sneaky throws IOException, so check for it here
+                if (ex instanceof IOException) {
+                    throw new CommandException(STRINGS.get("no.console"), ex);
+                }
+                throw ex;
             }
             if (mpv == null)
                 throw new CommandException(STRINGS.get("no.console"));