[
https://issues.apache.org/jira/browse/OAK-3171?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=14653092#comment-14653092
]
Chetan Mehrotra commented on OAK-3171:
--------------------------------------
+1. Logic is now simpler and we have a testcase also!
> Conflict Exception logs path information only on DEBUG
> ------------------------------------------------------
>
> Key: OAK-3171
> URL: https://issues.apache.org/jira/browse/OAK-3171
> Project: Jackrabbit Oak
> Issue Type: Bug
> Components: core
> Affects Versions: 1.2.3, 1.3.3, 1.0.17, 1.0.18
> Reporter: Alex Parvulescu
> Assignee: Alex Parvulescu
> Fix For: 1.2.4, 1.3.5, 1.0.19
>
> Attachments: OAK-3171.patch
>
>
> Post OAK-3057, the Conflict Exception is not logging path information, unless
> DEBUG logs are enabled. This is an unfortunate regression and needs to be
> fixed.
> {code}
> Caused by: org.apache.jackrabbit.oak.api.CommitFailedException: OakState0001:
> Unresolved conflicts in null
> at
> org.apache.jackrabbit.oak.plugins.commit.ConflictValidator.failOnMergeConflict(ConflictValidator.java:127)
> at
> org.apache.jackrabbit.oak.plugins.commit.ConflictValidator.propertyChanged(ConflictValidator.java:102)
> at
> org.apache.jackrabbit.oak.spi.commit.CompositeEditor.propertyChanged(CompositeEditor.java:91)
> at
> org.apache.jackrabbit.oak.spi.commit.EditorDiff.propertyChanged(EditorDiff.java:93)
> at
> org.apache.jackrabbit.oak.plugins.memory.ModifiedNodeState.compareAgainstBaseState(ModifiedNodeState.java:378)
> at
> org.apache.jackrabbit.oak.spi.commit.EditorDiff.childNodeChanged(EditorDiff.java:148)
> at
> org.apache.jackrabbit.oak.plugins.memory.ModifiedNodeState.compareAgainstBaseState(ModifiedNodeState.java:396)
> at
> org.apache.jackrabbit.oak.spi.commit.EditorDiff.childNodeChanged(EditorDiff.java:148)
> at
> org.apache.jackrabbit.oak.plugins.memory.ModifiedNodeState.compareAgainstBaseState(ModifiedNodeState.java:396)
> at
> org.apache.jackrabbit.oak.spi.commit.EditorDiff.childNodeChanged(EditorDiff.java:148)
> {code}
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
