Skip to content

Commit f9fe8e4

Browse files
puiterwijkvlsi
authored andcommitted
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.
1 parent 872112b commit f9fe8e4

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -223,9 +223,9 @@ private String getPassword() {
223223
}
224224
System.setProperty(KEY_STORE_PASSWORD, this.defaultpw);
225225
password = this.defaultpw;
226+
} else {
227+
log.warn("No password provided, and no GUI present so cannot prompt");
226228
}
227-
} else {
228-
log.warn("No password provided, and no GUI present so cannot prompt");
229229
}
230230
return password;
231231
}

0 commit comments

Comments
 (0)