remm 2003/10/14 14:34:58 Modified: catalina/src/share/org/apache/catalina/startup Embedded.java Log: - Canonicalize catalinaBase and catalinaHome. - Fix bug 23799. Revision Changes Path 1.11 +22 -1 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Embedded.java Index: Embedded.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Embedded.java,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- Embedded.java 2 Sep 2003 21:22:00 -0000 1.10 +++ Embedded.java 14 Oct 2003 21:34:58 -0000 1.11 @@ -64,6 +64,8 @@ import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; +import java.io.File; +import java.io.IOException; import java.net.InetAddress; import org.apache.catalina.Connector; @@ -1126,12 +1128,31 @@ } } if (catalinaHome != null) { + File home = new File(catalinaHome); + if (!home.isAbsolute()) { + try { + catalinaHome = home.getCanonicalPath(); + } catch (IOException e) { + catalinaHome = home.getAbsolutePath(); + } + } System.setProperty("catalina.home", catalinaHome); } if (System.getProperty("catalina.base") == null) { System.setProperty("catalina.base", System.getProperty("catalina.home")); + } else { + String catalinaBase = System.getProperty("catalina.base"); + File base = new File(catalinaBase); + if (!base.isAbsolute()) { + try { + catalinaBase = base.getCanonicalPath(); + } catch (IOException e) { + catalinaBase = base.getAbsolutePath(); + } + } + System.setProperty("catalina.base", catalinaBase); } }
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]