jackrabbit-oak-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alexparvule...@apache.org
Subject svn commit: r1421913 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/p2/strategy/ContentMirrorStoreStrategy.java
Date Fri, 14 Dec 2012 15:02:50 GMT
Author: alexparvulescu
Date: Fri Dec 14 15:02:48 2012
New Revision: 1421913

URL: http://svn.apache.org/viewvc?rev=1421913&view=rev
Log:
OAK-520 IllegalStateException in MemoryNodeBuilder

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/p2/strategy/ContentMirrorStoreStrategy.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/p2/strategy/ContentMirrorStoreStrategy.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/p2/strategy/ContentMirrorStoreStrategy.java?rev=1421913&r1=1421912&r2=1421913&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/p2/strategy/ContentMirrorStoreStrategy.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/p2/strategy/ContentMirrorStoreStrategy.java
Fri Dec 14 15:02:48 2012
@@ -61,16 +61,17 @@ public class ContentMirrorStoreStrategy 
         }
         // prune the index: remove all children that have no children
         // and no "match" property progressing bottom up
-        while (!parentQueue.isEmpty()) {
-            NodeBuilder node = parentQueue.poll();
-            for (String name : node.getChildNodeNames()) {
-                NodeBuilder segment = node.child(name);
-                if (segment.getChildNodeCount() == 0
-                        && segment.getProperty("match") == null) {
-                    segment.removeNode(name);
-                }
-            }
-        }
+        // see OAK-520
+        // while (!parentQueue.isEmpty()) {
+        // NodeBuilder node = parentQueue.poll();
+        // for (String name : node.getChildNodeNames()) {
+        // NodeBuilder segment = node.child(name);
+        // if (segment.getChildNodeCount() == 0
+        // && segment.getProperty("match") == null) {
+        // segment.removeNode(name);
+        // }
+        // }
+        // }
         // finally remove the index node if empty
         if (child.getChildNodeCount() == 0) {
             index.removeNode(key);



Mime
View raw message