[exo-jcr-commits] exo-jcr SVN: r4156 - jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/backup/rdbms.

[do-not-reply at jboss.org]

Author: tolusha
Date: 2011-03-21 03:39:10 -0400 (Mon, 21 Mar 2011)
New Revision: 4156

Modified:
   jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/backup/rdbms/DirectoryRestor.java
Log:
EXOJCR-1081:  use IdGenerator to get unique name for directory

Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/backup/rdbms/DirectoryRestor.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/backup/rdbms/DirectoryRestor.java	2011-03-21 03:23:03 UTC (rev 4155)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/backup/rdbms/DirectoryRestor.java	2011-03-21 07:39:10 UTC (rev 4156)
@@ -21,6 +21,7 @@
 import org.exoplatform.services.jcr.impl.backup.BackupException;
 import org.exoplatform.services.jcr.impl.backup.DataRestor;
 import org.exoplatform.services.jcr.impl.util.io.DirectoryHelper;
+import org.exoplatform.services.jcr.util.IdGenerator;
 import org.exoplatform.services.log.ExoLogger;
 import org.exoplatform.services.log.Log;
 
@@ -67,11 +68,6 @@
    private static final String PREFIX = "fsrestorer";
 
    /**
-    * Guarantee the unique name.
-    */
-   private static volatile int uniqueIndex = 0;
-
-   /**
     * Constructor DirectoryRestorer.
     * 
     * @param dataDirs
@@ -104,7 +100,7 @@
       {
          try
          {
-            File tmpDir = new File(tempDir, PREFIX + (System.currentTimeMillis() + uniqueIndex++));
+            File tmpDir = new File(tempDir, IdGenerator.generate());
             DirectoryHelper.copyDirectory(dataDir, tmpDir);
 
             tmpDirs.add(tmpDir);