svn commit: r1082038 - /commons/proper/net/trunk/src/main/java/org/apache/commons/net/util/TrustManagerUtils.java

[sebb]

Author: sebb
Date: Wed Mar 16 03:27:36 2011
New Revision: 1082038

URL: http://svn.apache.org/viewvc?rev=1082038&view=rev
Log:
Allow TrustStore to be provided

Modified:
    
commons/proper/net/trunk/src/main/java/org/apache/commons/net/util/TrustManagerUtils.java

Modified: 
commons/proper/net/trunk/src/main/java/org/apache/commons/net/util/TrustManagerUtils.java
URL: 
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/util/TrustManagerUtils.java?rev=1082038&r1=1082037&r2=1082038&view=diff
==============================================================================
--- 
commons/proper/net/trunk/src/main/java/org/apache/commons/net/util/TrustManagerUtils.java
 (original)
+++ 
commons/proper/net/trunk/src/main/java/org/apache/commons/net/util/TrustManagerUtils.java
 Wed Mar 16 03:27:36 2011
@@ -99,13 +99,14 @@ public final class TrustManagerUtils
      * This should be the same as the default used by {@link 
javax.net.ssl.SSLContext#init(javax.net.ssl.KeyManager[], 
javax.net.ssl.TrustManager[], java.security.SecureRandom)
      * SSLContext#init(KeyManager[], TrustManager[], SecureRandom)}
      * when the TrustManager parameter is set to {@code null}
+     * @param keyStore the KeyStore to use, may be {@code null}
      * @return the default TrustManager
      * @throws GeneralSecurityException
      */
-    public static X509TrustManager getDefaultTrustManager() throws 
GeneralSecurityException {
+    public static X509TrustManager getDefaultTrustManager(KeyStore keyStore) 
throws GeneralSecurityException {
         String defaultAlgorithm = TrustManagerFactory.getDefaultAlgorithm();
         TrustManagerFactory instance = 
TrustManagerFactory.getInstance(defaultAlgorithm);
-        instance.init((KeyStore)null);
+        instance.init(keyStore);
         return (X509TrustManager) instance.getTrustManagers()[0];
     }