[OAK-6379] NPE in MergingNodeStateDiff on DELETE_DELETED_PROPERTY

• Type: Bug
• Status: Closed
• Priority: Major
• Resolution: Fixed
• Fix Version/s: 1.7.3, 1.8.0
• Component/s: core
• Assignee: Alex Deparvu
• Reporter: Alex Deparvu
• Created: 21/Jun/17 15:00
• Updated: 08/Jan/18 13:36
• Resolved: 22/Jun/17 10:23

Description

Relevant trace:

java.lang.NullPointerException: null
    at com.google.common.base.Preconditions.checkNotNull(Preconditions.java:192) ~[guava-15.0.jar:na]
    at org.apache.jackrabbit.oak.plugins.memory.MemoryNodeBuilder.setProperty(MemoryNodeBuilder.java:507) ~[classes/:na]
    at org.apache.jackrabbit.oak.plugins.commit.MergingNodeStateDiff.applyPropertyResolution(MergingNodeStateDiff.java:171) ~[classes/:na]
    at org.apache.jackrabbit.oak.plugins.commit.MergingNodeStateDiff.resolveConflict(MergingNodeStateDiff.java:126) ~[classes/:na]

Issue Links

• is broken by: OAK-3381 Provide Common Ancestor To ConflictHandler