yoavs 2005/07/21 14:40:56
Modified: catalina/src/share/org/apache/catalina/startup
ContextConfig.java
webapps/docs changelog.xml
Log:
Bugzilla 35819: http://issues.apache.org/bugzilla/show_bug.cgi?id=35819
Revision Changes Path
1.65 +4 -2
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/ContextConfig.java
Index: ContextConfig.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/ContextConfig.java,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- ContextConfig.java 16 Mar 2005 11:37:43 -0000 1.64
+++ ContextConfig.java 21 Jul 2005 21:40:56 -0000 1.65
@@ -1240,7 +1240,9 @@
// Called from StandardContext.destroy()
if (log.isDebugEnabled())
log.debug(sm.getString("contextConfig.destroy"));
- String workDir = ((StandardContext) context).getWorkDir();
+
+ // Changed to getWorkPath per Bugzilla 35819.
+ String workDir = ((StandardContext) context).getWorkPath();
if (workDir != null)
ExpandWar.delete(new File(workDir));
}
1.330 +4 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
retrieving revision 1.329
retrieving revision 1.330
diff -u -r1.329 -r1.330
--- changelog.xml 21 Jul 2005 21:23:47 -0000 1.329
+++ changelog.xml 21 Jul 2005 21:40:56 -0000 1.330
@@ -182,6 +182,10 @@
<add>
<bug>34805</bug>: Add warning for suspicious security patterns, as
suggested by Ralf Hauser. (yoavs)
</add>
+ <fix>
+ <bug>35819</bug>: Use getWorkPath for deleting work directory on
context destroy, as suggested
+ by Rob Steele. (yoavs)
+ </fix>
</changelog>
</subsection>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
