billbarker 2003/10/05 17:08:19 Modified: util/java/org/apache/tomcat/util/net/jsse JSSESocketFactory.java Log: Attempting to escape the dreaded tab-police. This just hasn't been my day. Apologies for all of the bad commits. Revision Changes Path 1.11 +5 -5 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java Index: JSSESocketFactory.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- JSSESocketFactory.java 5 Oct 2003 23:43:47 -0000 1.10 +++ JSSESocketFactory.java 6 Oct 2003 00:08:19 -0000 1.11 @@ -266,13 +266,13 @@ KeyStore trustStore = null; String trustStoreFile = (String)attributes.get("truststoreFile"); - if(trustStoreFile == null) { - trustStoreFile = System.getProperty("javax.net.ssl.trustStore"); - } + if(trustStoreFile == null) { + trustStoreFile = System.getProperty("javax.net.ssl.trustStore"); + } String trustStorePassword = (String)attributes.get("truststorePass"); - if( trustStorePassword == null) { + if( trustStorePassword == null) { trustStorePassword = System.getProperty("javax.net.ssl.trustStorePassword"); - } + } if (trustStoreFile != null && trustStorePassword != null){ trustStore = getStore(keystoreType, trustStoreFile, trustStorePassword);
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]