directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kayyag...@apache.org
Subject svn commit: r1394415 - /directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapConnectionConfig.java
Date Fri, 05 Oct 2012 08:54:45 GMT
Author: kayyagari
Date: Fri Oct  5 08:54:44 2012
New Revision: 1394415

URL: http://svn.apache.org/viewvc?rev=1394415&view=rev
Log:
o use the default algorithm and initialize with the null keystore to load all the default
trusted certificates (DIRAPI-91)

Modified:
    directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapConnectionConfig.java

Modified: directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapConnectionConfig.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapConnectionConfig.java?rev=1394415&r1=1394414&r2=1394415&view=diff
==============================================================================
--- directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapConnectionConfig.java
(original)
+++ directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapConnectionConfig.java
Fri Oct  5 08:54:44 2012
@@ -112,13 +112,13 @@ public class LdapConnectionConfig
      */
     private void setDefaultTrustManager()
     {
-        String trustMgmtAlgo = "SunX509";
+        String trustMgmtAlgo = TrustManagerFactory.getDefaultAlgorithm();
 
         try
         {
             TrustManagerFactory tmFactory = TrustManagerFactory.getInstance( trustMgmtAlgo
);
-            tmFactory.init( KeyStore.getInstance( KeyStore.getDefaultType() ) );
-
+            tmFactory.init( ( KeyStore ) null );
+            
             TrustManager factoryTrustManagers[] = tmFactory.getTrustManagers();
 
             for ( int i = 0; i < factoryTrustManagers.length; i++ )



Mime
View raw message