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

[do-not-reply at jboss.org]

Author: tolusha
Date: 2011-07-15 08:22:58 -0400 (Fri, 15 Jul 2011)
New Revision: 4638

Modified:
   jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/BackupManagerImpl.java
Log:
EXOJCR-1434: FileCleaner in BackupManagerImpl should be used from proper RepositoryContainer

Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/BackupManagerImpl.java
===================================================================
--- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/BackupManagerImpl.java	2011-07-15 12:06:27 UTC (rev 4637)
+++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/BackupManagerImpl.java	2011-07-15 12:22:58 UTC (rev 4638)
@@ -198,7 +198,6 @@
 
    private final RegistryService registryService;
 
-   private FileCleaner fileCleaner;
 
    private BackupScheduler scheduler;
 
@@ -846,21 +845,7 @@
     */
    public void start()
    {
-      // get FileCleaner from container's component FileCleanerHolder
-      try
-      {
-         ManageableRepository repository = repoService.getCurrentRepository();
-         String workspaceName = repository.getConfiguration().getSystemWorkspaceName();
 
-         this.fileCleaner =
-            ((FileCleanerHolder)repository.getWorkspaceContainer(workspaceName).getComponent(FileCleanerHolder.class))
-               .getFileCleaner();
-      }
-      catch (RepositoryException e)
-      {
-         // do nothing. should not happens
-      }
-
       //remove if exists all old jcrrestorewi*.tmp files.
       File[] files = PrivilegedFileHelper.listFiles(tempDir, new JcrRestoreWiFilter());
       for (int i = 0; i < files.length; i++)
@@ -1008,10 +993,11 @@
       throws RepositoryException, RepositoryConfigurationException, BackupOperationException, FileNotFoundException,
       IOException, ClassNotFoundException
    {
+      WorkspaceContainerFacade workspaceContainer = repoService.getRepository(repositoryName).getWorkspaceContainer(workspaceName);
       WorkspacePersistentDataManager dataManager =
-         (WorkspacePersistentDataManager)repoService.getRepository(repositoryName).getWorkspaceContainer(workspaceName)
+         (WorkspacePersistentDataManager)workspaceContainer
             .getComponent(WorkspacePersistentDataManager.class);
-
+      FileCleaner fileCleaner = ((FileCleanerHolder)workspaceContainer.getComponent(FileCleanerHolder.class)).getFileCleaner();
       JCRRestore restorer = new JCRRestore(dataManager, fileCleaner);
       restorer.incrementalRestore(new File(pathBackupFile));
    }