[exo-jcr-commits] exo-jcr SVN: r4165 - in jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock: jbosscache and 1 other directory.

[do-not-reply at jboss.org]

Author: tolusha
Date: 2011-03-23 08:08:33 -0400 (Wed, 23 Mar 2011)
New Revision: 4165

Modified:
   jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/infinispan/ISPNCacheableLockManagerImpl.java
   jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheableLockManagerImpl.java
Log:
EXOJCR-1170: no need to clean cache if repository is dropped

Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/infinispan/ISPNCacheableLockManagerImpl.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/infinispan/ISPNCacheableLockManagerImpl.java	2011-03-23 10:42:41 UTC (rev 4164)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/infinispan/ISPNCacheableLockManagerImpl.java	2011-03-23 12:08:33 UTC (rev 4165)
@@ -38,6 +38,7 @@
 import org.exoplatform.services.naming.InitialContextInitializer;
 import org.exoplatform.services.transaction.TransactionService;
 import org.infinispan.Cache;
+import org.infinispan.lifecycle.ComponentStatus;
 
 import java.io.Serializable;
 import java.security.AccessController;
@@ -416,6 +417,9 @@
    @Override
    protected void cleanCacheDirectly()
    {
-      cache.clear();
+      if (cache.getStatus() == ComponentStatus.RUNNING)
+      {
+         cache.clear();
+      }
    }
 }

Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheableLockManagerImpl.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheableLockManagerImpl.java	2011-03-23 10:42:41 UTC (rev 4164)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheableLockManagerImpl.java	2011-03-23 12:08:33 UTC (rev 4165)
@@ -39,6 +39,7 @@
 import org.exoplatform.services.transaction.TransactionService;
 import org.jboss.cache.Cache;
 import org.jboss.cache.CacheSPI;
+import org.jboss.cache.CacheStatus;
 import org.jboss.cache.Fqn;
 import org.jboss.cache.Node;
 import org.jboss.cache.config.CacheLoaderConfig;
@@ -590,7 +591,10 @@
    @Override
    protected void cleanCacheDirectly()
    {
-      cache.removeNode(lockRoot);
-      createStructuredNode(lockRoot);
+      if (cache.getCacheStatus() != CacheStatus.STARTED)
+      {
+         cache.removeNode(lockRoot);
+         createStructuredNode(lockRoot);
+      }
    }
 }