svn commit: r1468828 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/ModifiedNodeState.java

[ju...@apache.org]

Author: jukka
Date: Wed Apr 17 10:38:06 2013
New Revision: 1468828

URL: http://svn.apache.org/r1468828
Log:
OAK-778: Recursive wrapping of ModifiedNodeState

Add a collapse() call to ModifiedNodeState.with() to avoid too many levels of wrapping.
TODO: A better solution will be to identify and fix the root causes of such re-wrapping.

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/ModifiedNodeState.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/ModifiedNodeState.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/ModifiedNodeState.java?rev=1468828&r1=1468827&r2=1468828&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/ModifiedNodeState.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/ModifiedNodeState.java Wed Apr 17 10:38:06 2013
@@ -73,7 +73,8 @@ public class ModifiedNodeState extends A
         if (properties.isEmpty() && nodes.isEmpty()) {
             return base;
         } else {
-            return new ModifiedNodeState(base, properties, nodes);
+            // TODO: Do we need collapse() here? See OAK-778
+            return collapse(new ModifiedNodeState(base, properties, nodes));
         }
     }