[exo-jcr-commits] exo-jcr SVN: r2844 - in jcr/branches/1.14-ISPN/exo.jcr.component.core: src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/infinispan and 1 other directory.
Author: tolusha
Date: 2010-07-30 09:14:37 -0400 (Fri, 30 Jul 2010)
New Revision: 2844
Modified:
jcr/branches/1.14-ISPN/exo.jcr.component.core/pom.xml
jcr/branches/1.14-ISPN/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/infinispan/ISPNCacheWorkspaceStorageCache.java
Log:
EXOJCR-830: bug fixed, 1 test failed
Modified: jcr/branches/1.14-ISPN/exo.jcr.component.core/pom.xml
===================================================================
--- jcr/branches/1.14-ISPN/exo.jcr.component.core/pom.xml 2010-07-30 13:00:43 UTC (rev
2843)
+++ jcr/branches/1.14-ISPN/exo.jcr.component.core/pom.xml 2010-07-30 13:14:37 UTC (rev
2844)
@@ -404,11 +404,10 @@
</property-->
</systemProperties>
<includes>
-
<!--include>org/exoplatform/services/jcr/api/**/Test*.java</include>
+
<include>org/exoplatform/services/jcr/api/**/Test*.java</include>
<include>org/exoplatform/services/jcr/usecases/**/Test*.java</include>
<include>org/exoplatform/services/jcr/usecases/**/*Test.java</include>
-
<include>org/exoplatform/services/jcr/impl/**/Test*.java</include-->
-<include>**/**/TestOrderBefore.java</include>
+
<include>org/exoplatform/services/jcr/impl/**/Test*.java</include>
</includes>
<excludes>
<exclude>org/exoplatform/services/jcr/**/TestQueryUsecases.java</exclude>
Modified:
jcr/branches/1.14-ISPN/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/infinispan/ISPNCacheWorkspaceStorageCache.java
===================================================================
---
jcr/branches/1.14-ISPN/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/infinispan/ISPNCacheWorkspaceStorageCache.java 2010-07-30
13:00:43 UTC (rev 2843)
+++
jcr/branches/1.14-ISPN/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/infinispan/ISPNCacheWorkspaceStorageCache.java 2010-07-30
13:14:37 UTC (rev 2844)
@@ -724,6 +724,14 @@
*/
protected void updateInBuffer(final NodeData node, final NodeData prevNode)
{
+
+ if (node.getIdentifier().equals(prevNode.getIdentifier()))
+ {
+ if (cache.remove(new CacheQPath(prevNode.getParentIdentifier(),
prevNode.getQPath())) != null)
+ {
+ LOG.debug("Node not extists as a child but update asked " +
node.getQPath().getAsString());
+ }
+ }
// Fqn<String> prevFqn =
// makeChildFqn(childNodes, node.getParentIdentifier(),
prevNode.getQPath().getEntries()[prevNode.getQPath()
// .getEntries().length - 1]);