Author: markt
Date: Sat Jan 29 00:00:50 2011
New Revision: 1064932
URL: http://svn.apache.org/viewvc?rev=1064932&view=rev
Log:
Re-fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49978
Pre-existing dir should not break deployment
Modified:
tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java?rev=1064932&r1=1064931&r2=1064932&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java (original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java Sat Jan 29
00:00:50 2011
@@ -1128,7 +1128,7 @@ public class WebappLoader extends Lifecy
if (!copy((InputStream) object, os))
return false;
} else if (object instanceof DirContext) {
- if (!currentFile.mkdir())
+ if (!currentFile.isDirectory() && !currentFile.mkdir())
return false;
if (!copyDir((DirContext) object, currentFile))
return false;
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1064932&r1=1064931&r2=1064932&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Sat Jan 29 00:00:50 2011
@@ -72,6 +72,10 @@
context attribute is set to "true". (schultz)
</fix>
<fix>
+ <bug>49978</bug>: Correct another instance where deployment incorrectly
+ failed if a directory in the work area already existed. (markt)
+ </fix>
+ <fix>
<bug>50582</bug>: Refactor access logging so chunked encoding is not
forced for all requests if bytes sent is logged. (markt)
</fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
