[OAK-7801] CompositeNodeStore.merge() may trigger conflicting branches

• Type: Bug
• Status: Closed
• Priority: Major
• Resolution: Fixed
• Affects Version/s: 1.9.0
• Fix Version/s: 1.10.0, 1.9.9
• Component/s: composite, documentmk
• Assignee: Marcel Reutegger
• Reporter: Marcel Reutegger
• Created: 03/Oct/18 10:00
• Updated: 12/Oct/18 13:30
• Resolved: 04/Oct/18 09:45

Description

This issue only affects a CompositeNodeStore with a global DocumentNodeStore. The merge() may trigger the creation of two conflicting DocumentNodeStore branches, which then fails the merge operation even though there is no real conflicting change. This issue does not happen with 1.8 or earlier because those releases keep changes introduced by commit hooks in memory. See also OAK-7401.

Issue Links

• relates to: OAK-7401 Changes kept in memory when update limit is hit in commit hook