luehe 2003/08/09 10:17:17
Modified: util/java/org/apache/tomcat/util/net/jsse
JSSE14SocketFactory.java
Log:
Added check for (keystoreType == null) before calling getKeyManagers/getTrustManagers
Revision Changes Path
1.7 +3 -4
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/jsse/JSSE14SocketFactory.java
Index: JSSE14SocketFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/jsse/JSSE14SocketFactory.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- JSSE14SocketFactory.java 8 Aug 2003 23:57:02 -0000 1.6
+++ JSSE14SocketFactory.java 9 Aug 2003 17:17:17 -0000 1.7
@@ -111,6 +111,9 @@
if (algorithm == null) algorithm = defaultAlgorithm;
String keystoreType = (String)attributes.get("keystoreType");
+ if (keystoreType == null) {
+ keystoreType = defaultKeystoreType;
+ }
// Create and init SSLContext
SSLContext context = SSLContext.getInstance(protocol);
@@ -137,10 +140,6 @@
protected KeyManager[] getKeyManagers(String keystoreType,
String algorithm)
throws Exception {
-
- if (keystoreType == null) {
- keystoreType = defaultKeystoreType;
- }
String keystorePass = getKeystorePassword();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
