[
https://issues.apache.org/jira/browse/OAK-6379?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16058820#comment-16058820
]
Michael Dürig commented on OAK-6379:
------------------------------------
Patch LGTM. Good to have test coverage for the missing cases as well now. On a
minor note, I think it would be more readable to use the same kind of logic in
{{applyPropertyResolution}} and {{applyResolution}} to determine the conflict
type. Currently the former checks {{ours}} for {{null}} while that latter
discriminates on the value of {{conflictType}}.
> NPE in MergingNodeStateDiff on DELETE_DELETED_PROPERTY
> ------------------------------------------------------
>
> Key: OAK-6379
> URL: https://issues.apache.org/jira/browse/OAK-6379
> Project: Jackrabbit Oak
> Issue Type: Bug
> Components: core
> Reporter: Alex Deparvu
> Assignee: Alex Deparvu
> Fix For: 1.7.3
>
> Attachments: OAK-6379.patch
>
>
> Relevant trace:
> {noformat}
> 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]
> {noformat}
--
This message was sent by Atlassian JIRA
(v6.4.14#64029)
