Index: src/main/java/org/apache/jackrabbit/oak/kernel/KernelNodeState.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>windows-1252 =================================================================== --- src/main/java/org/apache/jackrabbit/oak/kernel/KernelNodeState.java (revision 1378039) +++ src/main/java/org/apache/jackrabbit/oak/kernel/KernelNodeState.java (revision ) @@ -21,6 +21,7 @@ import static org.apache.jackrabbit.oak.kernel.CoreValueMapper.fromJsopReader; import static org.apache.jackrabbit.oak.kernel.CoreValueMapper.listFromJsopReader; +import java.util.Collections; import java.util.Iterator; import java.util.LinkedHashMap; import java.util.List; @@ -124,6 +125,10 @@ } while (reader.matches(',')); reader.read('}'); reader.read(JsopReader.END); + // optimize for empty childNodes + if (childNodes.isEmpty()) { + childNodes = Collections.emptyMap(); + } } }