[exo-jcr-commits] exo-jcr SVN: r4397 - 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-05-19 08:05:52 -0400 (Thu, 19 May 2011)
New Revision: 4397

Modified:
   jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/BackupManagerImpl.java
Log:
EXOJCR-1353: NPE during incremental restore

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-05-19 10:45:49 UTC (rev 4396)
+++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/BackupManagerImpl.java	2011-05-19 12:05:52 UTC (rev 4397)
@@ -473,21 +473,6 @@
 
       currentRepositoryBackups = Collections.synchronizedSet(new HashSet<RepositoryBackupChain>());
 
-      // 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
-      }
-
       messages = new BackupMessagesLog(MESSAGES_MAXSIZE);
 
       scheduler = new BackupScheduler(this, messages);
@@ -848,6 +833,21 @@
     */
    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++)
@@ -856,7 +856,6 @@
       }
       
       // start all scheduled before tasks
-
       if (registryService != null && !registryService.getForceXMLConfigurationValue(initParams))
       {
          SessionProvider sessionProvider = SessionProvider.createSystemProvider();