commit f9fe8e4feb390c7774bcf8268b8757ed87ff3de6
author Patrick Uiterwijk <patrick@puiterwijk.org> Mon Oct 28 21:18:06 2024 +0100
committer Vladimir Sitnikov <sitnikov.vladimir@gmail.com> Tue Nov 26 10:24:57 2024 +0300
tree 120193a6f1c5837dac8a352106c3eceb619c02ca
parent 872112bf5d08d2f698f765b3c950b2898ec23e98

Fix KeyManage log when using CLI mode

Without this patch, whenever a KeyStore is used (for example for client
certificates) in CLI mode, there is a message that no password was
provided.
This was caused by the else of the condition being on the wrong if
statement, and can cause people to spend a lot of time trying to debug
why the key store won't work.

src/core/src/main/java/org/apache/jmeter/util/SSLManager.java

diff --git a/src/core/src/main/java/org/apache/jmeter/util/SSLManager.java b/src/core/src/main/java/org/apache/jmeter/util/SSLManager.java
index c48d969..81b233e 100644
--- a/src/core/src/main/java/org/apache/jmeter/util/SSLManager.java
+++ b/src/core/src/main/java/org/apache/jmeter/util/SSLManager.java
@@ -223,9 +223,9 @@
                 }
                 System.setProperty(KEY_STORE_PASSWORD, this.defaultpw);
                 password = this.defaultpw;
+            } else {
+                log.warn("No password provided, and no GUI present so cannot prompt");
             }
-        } else {
-            log.warn("No password provided, and no GUI present so cannot prompt");
         }
         return password;
     }