IndexRebuild task: don't use passphrase if envVar or CmdLine is an em…

…pty string
Riverside-Software · Feb 1, 2023 · 9cb96f9 · 9cb96f9
1 parent 59607ad
commit 9cb96f9
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/src/java/com/phenix/pct/PCTIndexRebuild.java b/src/java/com/phenix/pct/PCTIndexRebuild.java
@@ -163,9 +163,9 @@ private ExecTask idxBuildCmdLine() {
             exec.createArg().setValue(cpInternal);
         }
 
-        if ((passphraseEnvVar != null) || (passphraseCmdLine != null)) {
+        if (hasCmdLinePassphrase() || hasEnvPassphrase()) {
             exec.createArg().setValue("-Passphrase");
-            if (passphraseEnvVar != null) {
+            if (hasEnvPassphrase()) {
                 exec.setInputString(System.getenv(passphraseEnvVar) + System.lineSeparator() + generateInputString());
             } else {
                 exec.setInputString(getPassphraseFromCmdLine(passphraseCmdLine) + System.lineSeparator() + generateInputString());
@@ -182,4 +182,12 @@ private ExecTask idxBuildCmdLine() {
         return exec;
     }
 
+    private boolean hasCmdLinePassphrase() {
+        return (passphraseCmdLine != null) && !passphraseCmdLine.trim().isEmpty();
+    }
+
+    private boolean hasEnvPassphrase() {
+        return (passphraseEnvVar != null) && !passphraseEnvVar.trim().isEmpty();
+    }
+
 }