[jboss-cvs] JBossAS SVN: r97471 - in projects/jboss-jca/trunk: fungal/src/main/java/org/jboss/jca/fungal/util and 1 other directory.

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

Author: jesper.pedersen
Date: 2009-12-04 12:09:56 -0500 (Fri, 04 Dec 2009)
New Revision: 97471

Modified:
   projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/embedded/EmbeddedJCA.java
   projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/util/FileUtil.java
Log:
Add additional checks to extract()

Modified: projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/embedded/EmbeddedJCA.java
===================================================================
--- projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/embedded/EmbeddedJCA.java	2009-12-04 16:56:15 UTC (rev 97470)
+++ projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/embedded/EmbeddedJCA.java	2009-12-04 17:09:56 UTC (rev 97471)
@@ -332,7 +332,6 @@
     */
    private void removeDeployment(File deployment) throws IOException
    {
-      /*
       if (deployment == null)
          throw new IllegalArgumentException("Deployment is null");      
 
@@ -345,7 +344,6 @@
 
          recursiveDelete(deployment);
       }
-      */
    }
 
    /**

Modified: projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/util/FileUtil.java
===================================================================
--- projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/util/FileUtil.java	2009-12-04 16:56:15 UTC (rev 97470)
+++ projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/util/FileUtil.java	2009-12-04 17:09:56 UTC (rev 97471)
@@ -248,8 +248,16 @@
          }
          else
          {
-            if (!copy.mkdirs())
-               throw new IOException("Could not create " + copy);
+            if (!copy.exists())
+            {
+               if (!copy.mkdirs())
+                  throw new IOException("Could not create " + copy);
+            }
+            else
+            {
+               if (!copy.isDirectory())
+                  throw new IOException(copy + " isn't a directory");
+            }
          }
       }