Return 'false' if nested copyDir call failed.
authorkkolinko <kkolinko@13f79535-47bb-0310-9956-ffa450edef68>
Sun, 16 Aug 2009 01:55:25 +0000 (01:55 +0000)
committerkkolinko <kkolinko@13f79535-47bb-0310-9956-ffa450edef68>
Sun, 16 Aug 2009 01:55:25 +0000 (01:55 +0000)
It is part of the patch for issue 45403 that was applied in rev.804462

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

java/org/apache/catalina/loader/WebappLoader.java

index 4b3b179..a9bb2fe 100644 (file)
@@ -1163,7 +1163,8 @@ public class WebappLoader
                         return false;
                 } else if (object instanceof DirContext) {
                     currentFile.mkdir();
-                    copyDir((DirContext) object, currentFile);
+                    if (!copyDir((DirContext) object, currentFile))
+                        return false;
                 }
             }