[exo-jcr-commits] exo-jcr SVN: r5755 - jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene.

[do-not-reply at jboss.org]

Author: tolusha
Date: 2012-03-03 02:12:35 -0500 (Sat, 03 Mar 2012)
New Revision: 5755

Modified:
   jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/MultiIndex.java
Log:
EXOJCR-1778: improved error indexing handling

Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/MultiIndex.java
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/MultiIndex.java	2012-03-03 07:12:07 UTC (rev 5754)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/MultiIndex.java	2012-03-03 07:12:35 UTC (rev 5755)
@@ -1905,7 +1905,18 @@
          checkVolatileCommit();
       }
 
-      List<NodeData> children = stateMgr.getChildNodesData(node);
+      List<NodeData> children = null;
+      try
+      {
+         children = stateMgr.getChildNodesData(node);
+      }
+      catch (RepositoryException e)
+      {
+         log.error(
+            "Error indexing subtree " + node.getQPath().getAsString() + ". Check JCR consistency. " + e.getMessage(), e);
+         return;
+      }
+
       for (final NodeData nodeData : children)
       {
 
@@ -1953,6 +1964,7 @@
       IOException, InterruptedException
    {
       NodeData childState = (NodeData)stateMgr.getItemData(nodeData.getIdentifier());
+
       if (childState == null)
       {
          handler.getOnWorkspaceInconsistencyHandler().handleMissingChildNode(