Index: oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/Compactor.java
===================================================================
--- oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/Compactor.java	(revision 1807581)
+++ oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/Compactor.java	(working copy)
@@ -250,7 +250,7 @@
                 if (eagerFlush) {
                     child = builder.setChildNode(name);
                 } else {
-                    child = EMPTY_NODE.builder();
+                    child = writer.writeNode(EMPTY_NODE).builder();
                 }
                 boolean success = new CompactDiff(child, path, name).diff(
                         EMPTY_NODE, after);
Index: .
===================================================================
--- .	(revision 1807581)
+++ .	(working copy)

Property changes on: .
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /jackrabbit/oak/trunk:r1792049