svn commit: r1143848 - /wicket/trunk/wicket-core/src/main/java/org/apache/wicket/pageStore/DiskDataStore.java

[mgrigorov]

Author: mgrigorov
Date: Thu Jul  7 14:36:32 2011
New Revision: 1143848

URL: http://svn.apache.org/viewvc?rev=1143848&view=rev
Log:
WICKET-3875 Clear Files.remove() behavior

Use the utility methods from Files.


Modified:
    
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/pageStore/DiskDataStore.java

Modified: 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/pageStore/DiskDataStore.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/pageStore/DiskDataStore.java?rev=1143848&r1=1143847&r2=1143848&view=diff
==============================================================================
--- 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/pageStore/DiskDataStore.java
 (original)
+++ 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/pageStore/DiskDataStore.java
 Thu Jul  7 14:36:32 2011
@@ -433,7 +433,7 @@ public class DiskDataStore implements ID
                        File sessionFolder = 
diskDataStore.getSessionFolder(sessionId, false);
                        if (sessionFolder.exists())
                        {
-                               Files.remove(sessionFolder);
+                               Files.removeFolder(sessionFolder);
                        }
                        unbound = true;
                }
@@ -481,36 +481,9 @@ public class DiskDataStore implements ID
                File sessionFolder = new File(storeFolder, sessionId);
                if (create && sessionFolder.exists() == false)
                {
-                       mkdirs(sessionFolder);
+                       Files.mkdirs(sessionFolder);
                }
                return sessionFolder;
        }
 
-       /**
-        * Utility method for creating a directory
-        * 
-        * @param file
-        */
-       private void mkdirs(File file)
-       {
-               // for some reason, simple file.mkdirs sometimes fails under 
heavy load
-               for (int j = 0; j < 5; ++j)
-               {
-                       for (int i = 0; i < 10; ++i)
-                       {
-                               if (file.mkdirs())
-                               {
-                                       return;
-                               }
-                       }
-                       try
-                       {
-                               Thread.sleep(100);
-                       }
-                       catch (InterruptedException ignore)
-                       {
-                       }
-               }
-               log.error("Failed to make directory " + file);
-       }
 }