[jboss-cvs] JBossAS SVN: r96062 - projects/jboss-jca/trunk/web/src/main/java/org/jboss/jca/web.

[jboss-cvs-commits at lists.jboss.org]

Author: jesper.pedersen
Date: 2009-11-05 12:55:09 -0500 (Thu, 05 Nov 2009)
New Revision: 96062

Modified:
   projects/jboss-jca/trunk/web/src/main/java/org/jboss/jca/web/WARDeployer.java
Log:
[JBJCA-212] Always remove temporary directory

Modified: projects/jboss-jca/trunk/web/src/main/java/org/jboss/jca/web/WARDeployer.java
===================================================================
--- projects/jboss-jca/trunk/web/src/main/java/org/jboss/jca/web/WARDeployer.java	2009-11-05 17:20:36 UTC (rev 96061)
+++ projects/jboss-jca/trunk/web/src/main/java/org/jboss/jca/web/WARDeployer.java	2009-11-05 17:55:09 UTC (rev 96062)
@@ -25,6 +25,7 @@
 import org.jboss.jca.fungal.deployers.DeployException;
 import org.jboss.jca.fungal.deployers.Deployer;
 import org.jboss.jca.fungal.deployers.Deployment;
+import org.jboss.jca.fungal.util.FileUtil;
 
 import java.io.File;
 import java.io.IOException;
@@ -131,12 +132,12 @@
          File tmp = new File(SecurityActions.getSystemProperty("jboss.jca.home"), "/tmp/");
          File tmpDeployment = new File(tmp, "/web" + contextPath);
 
-         if (!tmpDeployment.exists())
-         {
-            if (!tmpDeployment.mkdirs())
-               throw new IOException("Unable to create " + tmpDeployment);
-         }
+         if (tmpDeployment.exists())
+            FileUtil.recursiveDelete(tmpDeployment);
 
+         if (!tmpDeployment.mkdirs())
+            throw new IOException("Unable to create " + tmpDeployment);
+
          // Map ROOT.war to /
          if ("/ROOT".equalsIgnoreCase(contextPath))
             contextPath = "/";