From: kkolinko <kkolinko@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sun, 16 Aug 2009 01:55:25 +0000 (+0000)
Subject: Return 'false' if nested copyDir call failed.
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=2929a98b778dd4d9be6b95438bc509af68a46317;p=tomcat7.0

Return 'false' if nested copyDir call failed.
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
---

diff --git a/java/org/apache/catalina/loader/WebappLoader.java b/java/org/apache/catalina/loader/WebappLoader.java
index 4b3b17994..a9bb2fea5 100644
--- a/java/org/apache/catalina/loader/WebappLoader.java
+++ b/java/org/apache/catalina/loader/WebappLoader.java
@@ -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;
                 }
             }