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

[sebb]

Author: sebb
Date: Wed Mar 16 03:18:41 2011
New Revision: 1082036

URL: http://svn.apache.org/viewvc?rev=1082036&view=rev
Log:
TMF needs to be initialised.

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=1082036&r1=1082035&r2=1082036&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:18:41 2011
@@ -17,7 +17,8 @@
 
 package org.apache.commons.net.util;
 
-import java.security.NoSuchAlgorithmException;
+import java.security.GeneralSecurityException;
+import java.security.KeyStore;
 import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
 
@@ -99,11 +100,13 @@ public final class TrustManagerUtils
      * SSLContext#init(KeyManager[], TrustManager[], SecureRandom)}
      * when the TrustManager parameter is set to {@code null}
      * @return the default TrustManager
-     * @throws NoSuchAlgorithmException
+     * @throws GeneralSecurityException
      */
-    public static X509TrustManager getDefaultTrustManager() throws 
NoSuchAlgorithmException {
-        return (X509TrustManager) 
TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm())
-        .getTrustManagers()[0];
+    public static X509TrustManager getDefaultTrustManager() throws 
GeneralSecurityException {
+        String defaultAlgorithm = TrustManagerFactory.getDefaultAlgorithm();
+        TrustManagerFactory instance = 
TrustManagerFactory.getInstance(defaultAlgorithm);
+        instance.init((KeyStore)null);
+        return (X509TrustManager) instance.getTrustManagers()[0];
     }
 
 }