NPE in ServicingSearchIndex#updateNodes

A client has reported NullPointerExceptions in the logs, coming from org.hippoecm.repository.query.lucene.ServicingSearchIndex#updateNodes (ServicingSearchIndex.java:415)

411: final Map<NodeId, NodeState> augmentedAdd = new HashMap<>();
412: while (add.hasNext()) {
413:    final NodeState nodeState = add.next();
414:    // since NodeState does not have hashcode/equals impls, we need to use NodeId for equals in Map
415:    augmentedAdd.put(nodeState.getNodeId(), nodeState);
416: }

Since nodeState = null on ine 415, this seems a problem where after an iterator .next() call, its result is not checked for null, while the iterator can return null (see in the SearchManager from Hippo-patched JackRabbit).

Before the rewrite of that method in REPO-1426, null checks were in place.