Author: kkolinko
Date: Sun Aug 16 01:55:25 2009
New Revision: 804544
URL: http://svn.apache.org/viewvc?rev=804544&view=rev
Log:
Return 'false' if nested copyDir call failed.
It is part of the patch for issue 45403 that was applied in rev.804462
Modified:
tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java
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=804544&r1=804543&r2=804544&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java (original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java Sun Aug 16
01:55:25 2009
@@ -1163,7 +1163,8 @@
return false;
} else if (object instanceof DirContext) {
currentFile.mkdir();
- copyDir((DirContext) object, currentFile);
+ if (!copyDir((DirContext) object, currentFile))
+ return false;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
