geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r942094 - /geronimo/server/trunk/framework/modules/geronimo-main/src/main/java/org/apache/geronimo/main/Utils.java
Date Fri, 07 May 2010 15:00:52 GMT
Author: gawor
Date: Fri May  7 15:00:51 2010
New Revision: 942094

URL: http://svn.apache.org/viewvc?rev=942094&view=rev
Log:
GERONIMO-5287: Delete as many as files as we can. Based on patch from Ivan

Modified:
    geronimo/server/trunk/framework/modules/geronimo-main/src/main/java/org/apache/geronimo/main/Utils.java

Modified: geronimo/server/trunk/framework/modules/geronimo-main/src/main/java/org/apache/geronimo/main/Utils.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-main/src/main/java/org/apache/geronimo/main/Utils.java?rev=942094&r1=942093&r2=942094&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-main/src/main/java/org/apache/geronimo/main/Utils.java
(original)
+++ geronimo/server/trunk/framework/modules/geronimo-main/src/main/java/org/apache/geronimo/main/Utils.java
Fri May  7 15:00:51 2010
@@ -288,15 +288,15 @@ public class Utils {
                 for (int i = 0; i < files.length; i++) {
                     File file = files[i];
                     if (file.isDirectory()) {
-                        ok = ok && recursiveDelete(file);
+                        ok = recursiveDelete(file) && ok;
                     } else {
-                        ok = ok && file.delete();
+                        ok = file.delete() && ok;
                     }
                 }
             }
         }
         
-        ok = ok && root.delete();
+        ok = root.delete() && ok;
         
         return ok;
     }



Mime
View raw message