Author: nzamosenchuk Date: 2011-03-17 06:14:45 -0400 (Thu, 17 Mar 2011) New Revision: 4104 Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/AbstractIndexerCacheStore.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/ISPNIndexChangesFilter.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/LocalIndexChangesFilter.java Log: EXOJCR-834 : Fixed Indexer issue (replication timeout and locking issue) Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/AbstractIndexerCacheStore.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/AbstractIndexerCacheStore.java 2011-03-16 19:15:31 UTC (rev 4103) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/AbstractIndexerCacheStore.java 2011-03-17 10:14:45 UTC (rev 4104) @@ -28,6 +28,7 @@ import org.exoplatform.services.log.ExoLogger; import org.exoplatform.services.log.Log; import org.infinispan.container.entries.InternalCacheEntry; +import org.infinispan.context.Flag; import org.infinispan.loaders.AbstractCacheStore; import org.infinispan.loaders.AbstractCacheStoreConfig; import org.infinispan.loaders.CacheLoaderConfig; @@ -116,7 +117,8 @@ if (getModeHandler().getMode() == IndexerIoMode.READ_WRITE) { // remove the data from the cache - cache.remove(key); + cache.getAdvancedCache().withFlags(Flag.SKIP_LOCKING); + cache.removeAsync(key); } } } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/ISPNIndexChangesFilter.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/ISPNIndexChangesFilter.java 2011-03-16 19:15:31 UTC (rev 4103) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/ISPNIndexChangesFilter.java 2011-03-17 10:14:45 UTC (rev 4104) @@ -35,7 +35,7 @@ import org.exoplatform.services.log.Log; import org.infinispan.Cache; import org.infinispan.CacheException; -import org.infinispan.config.Configuration.CacheMode; +import org.infinispan.context.Flag; import org.infinispan.loaders.CacheLoaderManager; import java.io.IOException; @@ -129,6 +129,7 @@ ChangesKey changesKey = new ChangesKey(wsId, IdGenerator.generate()); try { + cache.getAdvancedCache().withFlags(Flag.SKIP_LOCKING); PrivilegedISPNCacheHelper.put(cache, changesKey, new ChangesFilterListsWrapper(changes, parentChanges)); } catch (CacheException e) Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/LocalIndexChangesFilter.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/LocalIndexChangesFilter.java 2011-03-16 19:15:31 UTC (rev 4103) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/LocalIndexChangesFilter.java 2011-03-17 10:14:45 UTC (rev 4104) @@ -35,6 +35,7 @@ import org.exoplatform.services.log.Log; import org.infinispan.Cache; import org.infinispan.CacheException; +import org.infinispan.context.Flag; import org.infinispan.loaders.CacheLoaderManager; import java.io.IOException; @@ -122,6 +123,7 @@ ChangesKey changesKey = new ChangesKey(wsId, IdGenerator.generate()); try { + cache.getAdvancedCache().withFlags(Flag.SKIP_LOCKING); PrivilegedISPNCacheHelper.put(cache, changesKey, new ChangesFilterListsWrapper(changes, parentChanges)); } catch (CacheException e)