OF-30: Don't overwrite the TrustStore.

git-svn-id: http://svn.igniterealtime.org/svn/repos/openfire/trunk@11493 b35dd754-fafc-0310-a699-88a17e54d16e

src/java/org/jivesoftware/openfire/net/SSLConfig.java

@@ -315,8 +315,11 @@ public class SSLConfig {
             keyStore = KeyStore.getInstance(storeType);
             keyStore.load(null, keypass.toCharArray());
 
-            s2sTrustStore = KeyStore.getInstance(storeType);
-            s2sTrustStore.load(null, s2sTrustpass.toCharArray());
+            // Also generate the trustStore if necessary
+            if (s2sTrustStore == null) {
+                s2sTrustStore = KeyStore.getInstance(storeType);
+                s2sTrustStore.load(null, s2sTrustpass.toCharArray());
+            }
         }
         catch (Exception e) {
             Log.error("Unable to initialize keystore: ", e);