You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by co...@apache.org on 2003/04/25 23:16:22 UTC
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core StandardHostDeployer.java
costin 2003/04/25 14:16:22
Modified: catalina/src/share/org/apache/catalina/core
StandardHostDeployer.java
Log:
Refactored the method ( sorry, it got merged with the previous commit ) -
I assume there are other places that need the absolute path to the workdir.
In any case, the original behavior was wrong - if you have multiple engines you may not
have a single workDir ( i.e. each engine could have its own ).
Revision Changes Path
1.8 +2 -12 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardHostDeployer.java
Index: StandardHostDeployer.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardHostDeployer.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- StandardHostDeployer.java 19 Apr 2003 21:16:11 -0000 1.7
+++ StandardHostDeployer.java 25 Apr 2003 21:16:22 -0000 1.8
@@ -676,17 +676,7 @@
if (workDir == null &&
context instanceof StandardContext &&
((StandardContext)context).getWorkDir() != null) {
- workDir = new File(((StandardContext)context).getWorkDir());
- if (!workDir.isAbsolute()) {
- File catalinaHome = new File(System.getProperty("catalina.base"));
- String catalinaHomePath = null;
- try {
- catalinaHomePath = catalinaHome.getCanonicalPath();
- workDir = new File(catalinaHomePath,
- ((StandardContext)context).getWorkDir());
- } catch (IOException e) {
- }
- }
+ workDir = new File(((StandardContext)context).getWorkPath());
}
if (workDir != null && workDir.exists()) {
deleteDir(workDir);
---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org