0004697: Server can't open truststore after upgrade

JumpMind · Dec 9, 2020 · f49701e · f49701e
1 parent 822d0ec
commit f49701e
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/symmetric-util/src/main/java/org/jumpmind/security/SecurityService.java b/symmetric-util/src/main/java/org/jumpmind/security/SecurityService.java
@@ -74,7 +74,7 @@ public KeyStore getTrustStore() {
         try {
             KeyStore ks = KeyStore.getInstance(KeyStore.getDefaultType());
             FileInputStream is = new FileInputStream(getTrustStoreFilename());
-            ks.load(is, getTrustStorePassword().toCharArray());
+            ks.load(is, getTrustStorePassword() == null ? null : getTrustStorePassword().toCharArray());
             is.close();
             return ks;
         } catch (RuntimeException e) {
@@ -277,9 +277,7 @@ protected void initializeCipher(Cipher cipher, int mode) throws Exception {
     }
 
     protected String getTrustStorePassword() {
-        String password = unobfuscateIfNeeded(SecurityConstants.SYSPROP_TRUSTSTORE_PASSWORD);
-        password = (password != null) ? password : SecurityConstants.KEYSTORE_PASSWORD;
-        return password;
+        return unobfuscateIfNeeded(SecurityConstants.SYSPROP_TRUSTSTORE_PASSWORD);
     }
 
     protected String getKeyStorePassword() {