(jmeter) branch master updated: Fix KeyManage log when using CLI mode

[vladimirsitnikov]

This is an automated email from the ASF dual-hosted git repository.

vladimirsitnikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git


The following commit(s) were added to refs/heads/master by this push:
     new f9fe8e4feb Fix KeyManage log when using CLI mode
f9fe8e4feb is described below

commit f9fe8e4feb390c7774bcf8268b8757ed87ff3de6
Author: Patrick Uiterwijk <patr...@puiterwijk.org>
AuthorDate: Mon Oct 28 21:18:06 2024 +0100

    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 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 c48d9696c4..81b233e0a3 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 @@ public abstract class SSLManager {
                 }
                 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;
     }