Re-fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49978

Pre-existing dir should not break deployment

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1064932 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/loader/WebappLoader.java b/java/org/apache/catalina/loader/WebappLoader.java
index 1973478..446c1dc 100644 (file)
--- a/java/org/apache/catalina/loader/WebappLoader.java
+++ b/java/org/apache/catalina/loader/WebappLoader.java
@@ -1128,7 +1128,7 @@ public class WebappLoader extends LifecycleMBeanBase
                     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;

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 6db9f51..07719b1 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -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>