geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r539676 - /geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/keystore/FileKeystoreManager.java
Date Sat, 19 May 2007 02:33:12 GMT
Author: dwoods
Date: Fri May 18 19:33:12 2007
New Revision: 539676

URL: http://svn.apache.org/viewvc?view=rev&rev=539676
Log:
GERONIMO-3142 Server fails to startup under Sun Java 1.6 update 1.  Applied the patch from
Toby and verified that the Tomcat JEE5 assembly built with Sun 1.5.0_11 starts with both the
Sun 1.5.0_11 and Sun 1.6.0_01 JDKs.

Modified:
    geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/keystore/FileKeystoreManager.java

Modified: geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/keystore/FileKeystoreManager.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/keystore/FileKeystoreManager.java?view=diff&rev=539676&r1=539675&r2=539676
==============================================================================
--- geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/keystore/FileKeystoreManager.java
(original)
+++ geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/keystore/FileKeystoreManager.java
Fri May 18 19:33:12 2007
@@ -254,9 +254,8 @@
         try {
             Class cls = loader.loadClass("javax.net.ssl.SSLContext");
             Object ctx = cls.getMethod("getInstance", new Class[] {String.class}).invoke(null,
new Object[]{protocol});
-            Class kmc = loader.loadClass("[Ljavax.net.ssl.KeyManager;");
-            Class tmc = loader.loadClass("[Ljavax.net.ssl.TrustManager;");
-            Class src = loader.loadClass("java.security.SecureRandom");
+            Class kmc = Class.forName("[Ljavax.net.ssl.KeyManager;", false, loader);
+            Class tmc = Class.forName("[Ljavax.net.ssl.TrustManager;", false, loader);  
         Class src = loader.loadClass("java.security.SecureRandom");
             cls.getMethod("init", new Class[]{kmc, tmc, src}).invoke(ctx, new Object[]{
                                                                             keyInstance ==
null ? null : keyInstance.getKeyManager(algorithm, keyAlias, null),
                                                                             trustInstance
== null ? null : trustInstance.getTrustManager(algorithm, null),
@@ -307,8 +306,8 @@
         try {
             Class cls = loader.loadClass("javax.net.ssl.SSLContext");
             Object ctx = cls.getMethod("getInstance", new Class[] {String.class}).invoke(null,
new Object[]{protocol});
-            Class kmc = loader.loadClass("[Ljavax.net.ssl.KeyManager;");
-            Class tmc = loader.loadClass("[Ljavax.net.ssl.TrustManager;");
+            Class kmc = Class.forName("[Ljavax.net.ssl.KeyManager;", false, loader);
+            Class tmc = Class.forName("[Ljavax.net.ssl.TrustManager;", false, loader);
             Class src = loader.loadClass("java.security.SecureRandom");
             cls.getMethod("init", new Class[]{kmc, tmc, src}).invoke(ctx, new Object[]{keyInstance.getKeyManager(algorithm,
keyAlias, null),
                                                                             trustInstance
== null ? null : trustInstance.getTrustManager(algorithm, null),



Mime
View raw message