svn commit: r1541069 - /jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/kernel/NodeStoreTest.java

[mduerig]

Author: mduerig
Date: Tue Nov 12 14:18:10 2013
New Revision: 1541069

URL: http://svn.apache.org/r1541069
Log:
OAK-1143: [scala] Repository init throws "illegal cyclic reference involving 
class ChangeDispatcher" Make ChangeDispatcher
NodeStoreTest.afterCommitHook fails intermittently since the observer might now 
pass the same root node state in subsequent calls.

Modified:
    
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/kernel/NodeStoreTest.java

Modified: 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/kernel/NodeStoreTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/kernel/NodeStoreTest.java?rev=1541069&r1=1541068&r2=1541069&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/kernel/NodeStoreTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/kernel/NodeStoreTest.java
 Tue Nov 12 14:18:10 2013
@@ -157,8 +157,10 @@ public class NodeStoreTest {
             @Override
             public void contentChanged(
                     @Nonnull NodeState root, @Nullable CommitInfo info) {
-                observedRoot.set(checkNotNull(root));
-                latch.countDown();
+                if (root.getChildNode("test").hasChildNode("newNode")) {
+                    observedRoot.set(checkNotNull(root));
+                    latch.countDown();
+                }
             }
         });