Author: schultz
Date: Wed Jul 11 01:55:00 2012
New Revision: 1359981
URL: http://svn.apache.org/viewvc?rev=1359981&view=rev
Log:
Added check of return value for docBase.mkdir.
Modified:
tomcat/trunk/java/org/apache/catalina/startup/ExpandWar.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/ExpandWar.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ExpandWar.java?rev=1359981&r1=1359980&r2=1359981&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/ExpandWar.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ExpandWar.java Wed Jul 11
01:55:00 2012
@@ -84,7 +84,8 @@ public class ExpandWar {
}
// Create the new document base directory
- docBase.mkdir();
+ if(!docBase.mkdir() && !docBase.isDirectory())
+ throw new IOException(sm.getString("expandWar.createFailed",
docBase));
// Expand the WAR into the new document base directory
String canonicalDocBasePrefix = docBase.getCanonicalPath();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
