Author: remm
Date: Wed Mar  4 16:06:57 2015
New Revision: 1664064

URL: http://svn.apache.org/r1664064
Log:
Create sometimes missing marker parent file (META-INF) that caused testsuite 
failures.

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=1664064&r1=1664063&r2=1664064&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/ExpandWar.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ExpandWar.java Wed Mar  4 
16:06:57 2015
@@ -117,6 +117,12 @@ public class ExpandWar {
                 canonicalDocBasePrefix += File.separator;
             }
 
+            // Creating war tracker parent (normally META-INF)
+            File warTrackerParent = warTracker.getParentFile();
+            if (!warTrackerParent.isDirectory() && !warTrackerParent.mkdirs()) 
{
+                throw new IOException(sm.getString("expandWar.createFailed", 
warTrackerParent.getAbsolutePath()));
+            }
+
             Enumeration<JarEntry> jarEntries = jarFile.entries();
             while (jarEntries.hasMoreElements()) {
                 JarEntry jarEntry = jarEntries.nextElement();



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Reply via email to