Author: tolusha Date: 2011-04-19 08:49:57 -0400 (Tue, 19 Apr 2011) New Revision: 4254 Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/cacheable/AbstractCacheableLockManager.java Log: EXOJCR-1311: can restore without cache locks Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/cacheable/AbstractCacheableLockManager.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/cacheable/AbstractCacheableLockManager.java 2011-04-19 11:27:53 UTC (rev 4253) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/cacheable/AbstractCacheableLockManager.java 2011-04-19 12:49:57 UTC (rev 4254) @@ -39,6 +39,7 @@ import org.exoplatform.services.jcr.impl.backup.BackupException; import org.exoplatform.services.jcr.impl.backup.Backupable; import org.exoplatform.services.jcr.impl.backup.DataRestor; +import org.exoplatform.services.jcr.impl.backup.DummyDataRestor; import org.exoplatform.services.jcr.impl.backup.rdbms.DBBackup; import org.exoplatform.services.jcr.impl.core.SessionDataManager; import org.exoplatform.services.jcr.impl.core.lock.LockRemover; @@ -871,6 +872,13 @@ try { File contentFile = new File(storageDir, "CacheLocks" + DBBackup.CONTENT_FILE_SUFFIX); + + // it is possible that backup was created on configuration without Backupable WorkspaceLockManager class + if (!PrivilegedFileHelper.exists(contentFile)) + { + return new DummyDataRestor(); + } + in = new ObjectInputStream(PrivilegedFileHelper.fileInputStream(contentFile)); int count = in.readInt();