geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hogst...@apache.org
Subject svn commit: r529324 - /geronimo/server/trunk/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/util/DeploymentUtil.java
Date Mon, 16 Apr 2007 16:47:15 GMT
Author: hogstrom
Date: Mon Apr 16 09:47:14 2007
New Revision: 529324

URL: http://svn.apache.org/viewvc?view=rev&rev=529324
Log:
Updated DeploymentUtil to include all objects that fail to be deleted.

Modified:
    geronimo/server/trunk/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/util/DeploymentUtil.java

Modified: geronimo/server/trunk/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/util/DeploymentUtil.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/util/DeploymentUtil.java?view=diff&rev=529324&r1=529323&r2=529324
==============================================================================
--- geronimo/server/trunk/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/util/DeploymentUtil.java
(original)
+++ geronimo/server/trunk/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/util/DeploymentUtil.java
Mon Apr 16 09:47:14 2007
@@ -296,7 +296,7 @@
                 for (int i = 0; i < files.length; i++) {
                     File file = files[i];
                     if (file.isDirectory()) {
-                        recursiveDelete(file);
+                        recursiveDelete(file, unableToDeleteCollection);
                     } else {
                         if (!file.delete() && unableToDeleteCollection != null) {
                             unableToDeleteCollection.add(file);    
@@ -305,7 +305,11 @@
                 }
             }
         }
-        return root.delete();
+        boolean rootDeleteStatus = false;
+        if (!(rootDeleteStatus = root.delete()) && unableToDeleteCollection != null)

+        	unableToDeleteCollection.add(root);
+        
+        return rootDeleteStatus;
     }
     
     public static boolean recursiveDelete(File root) {



Mime
View raw message