exo-jcr SVN: r1628 - in jcr/trunk/exo.jcr.component.core/src: test/resources/conf/standalone/cluster and 1 other directory.
by do-not-reply＠jboss.org
Author: nzamosenchuk
Date: 2010-02-01 06:15:06 -0500 (Mon, 01 Feb 2010)
New Revision: 1628
Modified:
jcr/trunk/exo.jcr.component.core/src/main/resources/conf/portal/test-jbosscache-lock.xml
jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-lock.xml
Log:
EXOJCR-434: fixed: XML schema set to v.3.1
Modified: jcr/trunk/exo.jcr.component.core/src/main/resources/conf/portal/test-jbosscache-lock.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/resources/conf/portal/test-jbosscache-lock.xml 2010-02-01 10:13:33 UTC (rev 1627)
+++ jcr/trunk/exo.jcr.component.core/src/main/resources/conf/portal/test-jbosscache-lock.xml 2010-02-01 11:15:06 UTC (rev 1628)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.2">
+<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.1">
<locking useLockStriping="false" concurrencyLevel="50000" lockParentForChildInsertRemove="false"
lockAcquisitionTimeout="20000" />
Modified: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-lock.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-lock.xml 2010-02-01 10:13:33 UTC (rev 1627)
+++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-lock.xml 2010-02-01 11:15:06 UTC (rev 1628)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.2">
+<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.1">
<locking useLockStriping="false" concurrencyLevel="50000" lockParentForChildInsertRemove="false"
lockAcquisitionTimeout="20000" />
14 years, 3 months
- 1
- 0
exo-jcr SVN: r1627 - jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache.
by do-not-reply＠jboss.org
Author: nfilotto
Date: 2010-02-01 05:13:33 -0500 (Mon, 01 Feb 2010)
New Revision: 1627
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/ParentNodeEvictionActionPolicy.java
Log:
EXOJCR-460: We use the method getChildrenNamesDirect to avoid going through the interceptor chain
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/ParentNodeEvictionActionPolicy.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/ParentNodeEvictionActionPolicy.java 2010-01-29 16:24:58 UTC (rev 1626)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/ParentNodeEvictionActionPolicy.java 2010-02-01 10:13:33 UTC (rev 1627)
@@ -19,6 +19,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.jboss.cache.Cache;
+import org.jboss.cache.CacheSPI;
import org.jboss.cache.Fqn;
import org.jboss.cache.eviction.DefaultEvictionActionPolicy;
import org.jboss.cache.eviction.EvictionActionPolicy;
@@ -74,7 +75,10 @@
{
// The expected data structure is of type $CHILD_NODES/${node-id}/${sub-node-name} or
// $CHILD_PROPS/${node-id}/${sub-property-name}
- Set<Object> names = cache.getChildrenNames(parentFqn);
+
+ // We use the method getChildrenNamesDirect to avoid going through
+ // the interceptor chain (EXOJCR-460)
+ Set<Object> names = ((CacheSPI)cache).getNode(parentFqn).getChildrenNamesDirect();
if (names.isEmpty() || (names.size() == 1 && names.contains(fqn.get(2))))
{
if (log.isTraceEnabled())
14 years, 3 months
- 1
- 0