tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r653113 - /tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
Date Sat, 03 May 2008 19:49:58 GMT
Author: markt
Date: Sat May  3 12:49:57 2008
New Revision: 653113

URL: http://svn.apache.org/viewvc?rev=653113&view=rev
Log:
Fix bug 43117. Setting an empty workDir can delete all of CATALINA_HOME.
Patch provided by Takayuki Kaneko.

Modified:
    tomcat/trunk/java/org/apache/catalina/core/StandardContext.java

Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=653113&r1=653112&r2=653113&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Sat May  3 12:49:57 2008
@@ -4954,7 +4954,7 @@
 
         // Acquire (or calculate) the work directory path
         String workDir = getWorkDir();
-        if (workDir == null) {
+        if (workDir == null || workDir.length() == 0) {
 
             // Retrieve our parent (normally a host) name
             String hostName = null;



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message