DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
<http://nagoya.apache.org/bugzilla/show_bug.cgi?id=27050>.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND 
INSERTED IN THE BUG DATABASE.

http://nagoya.apache.org/bugzilla/show_bug.cgi?id=27050

keystoreFile parameter, when specified as relative, is not treated relative to 
$CATALINA_BASE or catalina.base property

[EMAIL PROTECTED] changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|NEW                         |RESOLVED
         Resolution|                            |FIXED



------- Additional Comments From [EMAIL PROTECTED]  2004-02-18 22:40 -------
Fixed.

DIFFS:

Index: JSSESocketFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java,v
retrieving revision 1.13
diff -u -r1.13 JSSESocketFactory.java
--- JSSESocketFactory.java      24 Jan 2004 04:56:32 -0000      1.13
+++ JSSESocketFactory.java      18 Feb 2004 22:39:36 -0000
@@ -58,6 +58,7 @@
  */ 
 package org.apache.tomcat.util.net.jsse;
 
+import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -309,7 +310,13 @@
         InputStream istream = null;
         try {
             ks = KeyStore.getInstance(type);
-            istream = new FileInputStream(path);
+            File keyStoreFile = new File(path);
+            if (!keyStoreFile.isAbsolute()) {
+                keyStoreFile = new File(System.getProperty("catalina.base"),
+                                        path);
+            }
+            istream = new FileInputStream(keyStoreFile);
+
             ks.load(istream, pass.toCharArray());
             istream.close();
             istream = null;

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to