Index: apache/jackrabbit/core/query/lucene/MultiIndex.java
===================================================================
--- apache/jackrabbit/core/query/lucene/MultiIndex.java	(revision 1661677)
+++ apache/jackrabbit/core/query/lucene/MultiIndex.java	(working copy)
@@ -1237,6 +1237,10 @@
                 // JCR-3268 log bundle corruption and continue
                 handler.getOnWorkspaceInconsistencyHandler().logError(e,
                         handler, childPath, node, child);
+            } catch (IllegalArgumentException e) {
+                // JCR-3854 log bundle corruption and continue
+                handler.getOnWorkspaceInconsistencyHandler().logError(e,
+                        handler, childPath, node, child);
             }
             if (childState != null) {
                 count = createIndex(childState, childPath, stateMgr, count);
Index: apache/jackrabbit/core/query/OnWorkspaceInconsistency.java
===================================================================
--- apache/jackrabbit/core/query/OnWorkspaceInconsistency.java	(revision 1661677)
+++ apache/jackrabbit/core/query/OnWorkspaceInconsistency.java	(working copy)
@@ -174,7 +174,8 @@
      * @throws RepositoryException if another error occurs not related to item
      *                             state reading.
      */
-    public void logError(ItemStateException exception, QueryHandler handler,
+	 // JCR-3854  IllegalArgumentException replaced by Exception
+    public void logError(Exception exception, QueryHandler handler,
             Path path, NodeState node, ChildNodeEntry child)
             throws RepositoryException {
         if (log.isErrorEnabled()) {