Added interactive check to readPassword()

payara · Aug 12, 2019 · e874701 · e874701
1 parent 14b33d0
commit e874701
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
diff --git a/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/CLICommand.java b/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/CLICommand.java
@@ -1229,6 +1229,9 @@ private String passwordName(ParamModel opt) {
      * @return 
      */
     protected char[] readPassword(String prompt) {
+        if (!programOpts.isInteractive()) {
+            return null;
+        }
         try {
             buildTerminal();
             buildLineReader();

diff --git a/...i/src/main/java/com/sun/enterprise/admin/cli/cluster/ChangeNodeMasterPasswordCommand.java b/...i/src/main/java/com/sun/enterprise/admin/cli/cluster/ChangeNodeMasterPasswordCommand.java
@@ -144,17 +144,6 @@ protected int executeCommand() throws CommandException {
         }
     }
 
-    /**
-     * Create the master password keystore. This routine can also modify the master
-     * password if the keystore already exists
-     *
-     * @throws CommandException if an error occurred while writing the master
-     *                          password file
-     */
-    protected void createMasterPasswordFile() throws CommandException {
-
-    }
-
     @Override
     public int execute(String... argv) throws CommandException {
         // We iterate through all the instances and so it should relax this requirement