From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sat, 8 May 2010 16:01:16 +0000 (+0000)
Subject: Stop the tests failing
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=7af532bd70556c5992b94ae0a252091861a35061;p=tomcat7.0

Stop the tests failing

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

diff --git a/test/org/apache/catalina/startup/TomcatBaseTest.java b/test/org/apache/catalina/startup/TomcatBaseTest.java
index c274176f4..08e5f3811 100644
--- a/test/org/apache/catalina/startup/TomcatBaseTest.java
+++ b/test/org/apache/catalina/startup/TomcatBaseTest.java
@@ -84,12 +84,12 @@ public abstract class TomcatBaseTest extends TestCase {
                 "org.apache.juli.ClassLoaderLogManager");
 
         tempDir = new File(System.getProperty("tomcat.test.temp", "output/tmp"));
-        if (!tempDir.mkdir()) {
+        if (!tempDir.exists() && !tempDir.mkdir()) {
             fail("Unable to create temporary directory for test");
         }
         
         File appBase = new File(tempDir, "webapps");
-        if (!appBase.mkdir()) {
+        if (!appBase.exists() && !appBase.mkdir()) {
             fail("Unable to create appBase for test");
         }