Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -450,8 +450,10 @@ public void loadConfiguration() {
String ks = config.keystoreFile;
performKeystoreFileChanged(ks);
performKeystoreTypeChanged(config.keystoreType);
performKeystorePassStorageTypeChanged(config.keystorePassStorageType);
performKeystoreStorePassChanged(config.keystoreStorePass);
performKeystoreKeyPassChanged(config.keystoreKeyPass);
// attn: order matters here, password fields need to come before storage type (since the storage type setter sets them from the text boxes)
performKeystorePassStorageTypeChanged(config.keystorePassStorageType);
try {
File ksf = new File(ks);
if (ksf.exists() && config.keystoreStorePass != null)
Expand All @@ -460,7 +462,6 @@ public void loadConfiguration() {
log.info("Failed to load keystore on init", e);
}
performKeystoreAliasChanged(config.keystoreAlias);
performKeystoreKeyPassChanged(config.keystoreKeyPass);
}

@Override
Expand Down
Loading