[OAK-943] Provide more details with CommitFailedException

• Type: Improvement
• Status: Closed
• Priority: Minor
• Resolution: Fixed
• Affects Version/s: 0.8
• Fix Version/s: 0.9
• Component/s: core
• Assignee: Chetan Mehrotra
• Reporter: Chetan Mehrotra
• Created: 07/Aug/13 06:08
• Updated: 01/Jul/15 05:52
• Resolved: 07/Aug/13 10:22

Description

Currently if a commit fails due to conflict it throws following exception

Caused by: org.apache.jackrabbit.oak.api.CommitFailedException: OakState0001: Unresolved conflicts in /
	at org.apache.jackrabbit.oak.plugins.commit.ConflictValidator.failOnMergeConflict(ConflictValidator.java:82)
	at org.apache.jackrabbit.oak.plugins.commit.ConflictValidator.propertyChanged(ConflictValidator.java:59)
	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:355)
	at org.apache.jackrabbit.oak.spi.commit.EditorDiff.process(EditorDiff.java:52)

With this much information its hard to see the conflict details. To help in debugging such issues the exception message must include the conflict related information

Discussion Thread - http://markmail.org/thread/4ipmyad6wwsy6th6

Issue Links

• is related to: OAK-3057 Simplify debugging conflict related errors