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

Author: tolusha Date: 2010-12-21 07:43:11 -0500 (Tue, 21 Dec 2010) New Revision: 3696 Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/IndexCleanHelper.java jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/ValueStorageCleanHelper.java Log: EXOJCR-747: fix clean helpers Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/IndexCleanHelper.java =================================================================== --- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/IndexCleanHelper.java 2010-12-21 12:08:03 UTC (rev 3695) +++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/IndexCleanHelper.java 2010-12-21 12:43:11 UTC (rev 3696) @@ -47,13 +47,21 @@ */ public void removeWorkspaceIndex(WorkspaceEntry wsConfig, boolean isSystem) throws RepositoryConfigurationException, IOException { - String indexDir = wsConfig.getQueryHandler().getParameterValue(QueryHandlerParams.PARAM_INDEX_DIR); + String indexDirName = wsConfig.getQueryHandler().getParameterValue(QueryHandlerParams.PARAM_INDEX_DIR); - removeFolder(new File(indexDir)); + File indexDir = new File(indexDirName); + if (indexDir.exists()) + { + removeFolder(indexDir); + } if (isSystem) { - removeFolder(new File(indexDir + "_" + SystemSearchManager.INDEX_DIR_SUFFIX)); + File systemIndexDir = new File(indexDirName + "_" + SystemSearchManager.INDEX_DIR_SUFFIX); + if (systemIndexDir.exists()) + { + removeFolder(systemIndexDir); + } } } Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/ValueStorageCleanHelper.java =================================================================== --- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/ValueStorageCleanHelper.java 2010-12-21 12:08:03 UTC (rev 3695) +++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/ValueStorageCleanHelper.java 2010-12-21 12:43:11 UTC (rev 3696) @@ -47,15 +47,19 @@ */ public void removeWorkspaceValueStorage(WorkspaceEntry wEntry) throws RepositoryConfigurationException, IOException { - ContainerEntry containerEntry = wEntry.getContainer(); - + ContainerEntry containerEntry = wEntry.getContainer(); + if (containerEntry.getValueStorages() != null) { for (ValueStorageEntry valueStorageEntry : containerEntry.getValueStorages()) { - String path = valueStorageEntry.getParameterValue(FileValueStorage.PATH); + String valueStorageDirName = valueStorageEntry.getParameterValue(FileValueStorage.PATH); - removeFolder(new File(path)); + File valueStorageDir = new File(valueStorageDirName); + if (valueStorageDir.exists()) + { + removeFolder(valueStorageDir); + } } } }