Author: mreutegg Date: Thu Dec 1 09:52:57 2016 New Revision: 1772166 URL: http://svn.apache.org/viewvc?rev=1772166&view=rev Log: OAK-5206: Avoid merge sort of changes in intermediate split documents
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java?rev=1772166&r1=1772165&r2=1772166&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java Thu Dec 1 09:52:57 2016 @@ -1545,7 +1545,10 @@ public final class NodeDocument extends } }; List<Iterable<Map.Entry<Revision, String>>> changes = Lists.newArrayList(); - changes.add(filter(getLocalMap(property).entrySet(), p)); + Map<Revision, String> localChanges = getLocalMap(property); + if (!localChanges.isEmpty()) { + changes.add(filter(localChanges.entrySet(), p)); + } boolean overlapping = false; List<Range> ranges = Lists.newArrayList();