Author: areshetnyak Date: 2010-01-19 04:33:12 -0500 (Tue, 19 Jan 2010) New Revision: 1471 Modified: jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheableLockManager.java Log: EXOJCR-412 : The skiping exception on delete locks properties (jcr:lockIsDeep, jcr:lockOwner) on save was added. Modified: jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheableLockManager.java =================================================================== --- jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheableLockManager.java 2010-01-18 23:01:45 UTC (rev 1470) +++ jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheableLockManager.java 2010-01-19 09:33:12 UTC (rev 1471) @@ -46,6 +46,7 @@ import org.exoplatform.services.jcr.impl.dataflow.TransientItemData; import org.exoplatform.services.jcr.impl.dataflow.TransientPropertyData; import org.exoplatform.services.jcr.impl.dataflow.persistent.WorkspacePersistentDataManager; +import org.exoplatform.services.jcr.impl.storage.JCRInvalidItemStateException; import org.exoplatform.services.jcr.observation.ExtendedEvent; import org.exoplatform.services.log.ExoLogger; import org.exoplatform.services.log.Log; @@ -715,6 +716,16 @@ dataManager.save(new TransactionChangesLog(changesLog)); } + catch (JCRInvalidItemStateException e) + { + //TODO EXOJCR-412, should be refactored in future. + //Skip property not found in DB, because that lock property was removed in other node of cluster. + if (log.isDebugEnabled()) + { + log.debug("The propperty was removed in other node of cluster.", e); + } + + } catch (RepositoryException e) { log.error("Error occur during removing lock" + e.getLocalizedMessage(), e);