Author: tolusha Date: 2012-03-03 07:24:05 -0500 (Sat, 03 Mar 2012) New Revision: 5773 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 handling during indexing 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 12:23:33 UTC (rev 5772) +++ 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 12:24:05 UTC (rev 5773) @@ -1963,12 +1963,22 @@ final AtomicLong count, final NodeData nodeData, final AtomicLong processed) throws RepositoryException, IOException, InterruptedException { - NodeData childState = (NodeData)stateMgr.getItemData(nodeData.getIdentifier()); + NodeData childState = null; + try + { + childState = (NodeData)stateMgr.getItemData(nodeData.getIdentifier()); + } + catch (RepositoryException e) + { + log.error( + "Error indexing subtree " + node.getQPath().getAsString() + ". Check JCR consistency. " + e.getMessage(), e); + return; + } if (childState == null) { - handler.getOnWorkspaceInconsistencyHandler().handleMissingChildNode( - new ItemNotFoundException("Child not found "), handler, nodeData.getQPath(), node, nodeData); + log.error("Error indexing subtree " + node.getQPath().getAsString() + ". Item not found."); + return; } if (nodeData != null)