Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Bug 332264

Summary: CDOMergingConflictResolver does not work with multiple commits
Product: [Modeling] EMF Reporter: Lothar Werzinger <lothar>
Component: cdo.coreAssignee: Pascal Lehmann <pascal.lehmann>
Status: CLOSED FIXED QA Contact: Eike Stepper <stepper>
Severity: normal    
Priority: P3 CC: jon
Version: 4.0Flags: stepper: review+
Target Milestone: ---   
Hardware: PC   
OS: Linux   
Whiteboard:
Attachments:
Description Flags
patch for unit test
stepper: iplog+
Patch v1
none
Cobined patch - ready to be committed none

Description Lothar Werzinger CLA 2010-12-09 18:29:24 EST 
Build Identifier: 

Caused by: java.util.ConcurrentModificationException: Attempt by Transaction[2:1] to modify historical revision


Reproducible: Always

Steps to Reproduce:
run the unit test with the patch
Comment 1 Lothar Werzinger CLA 2010-12-09 18:30:07 EST 
Created attachment 184913 [details]
patch for unit test
Comment 2 Pascal Lehmann CLA 2010-12-10 07:02:44 EST 
Created attachment 184944 [details]
Patch v1

Looks as if the revisionDelta's target is not updated.
Comment 3 Eike Stepper CLA 2010-12-10 07:07:11 EST 
Created attachment 184945 [details]
Cobined patch - ready to be committed
Comment 4 Pascal Lehmann CLA 2010-12-10 07:12:05 EST 
Committed combined Patch to HEAD.
Comment 5 Lothar Werzinger CLA 2010-12-10 10:45:06 EST 
Thanks for the very fast response.

P.S.
you may want to rename the unit tests, as bug1 and bug2 are not very descriptive. I just picked these as temporary names ;-)
Comment 6 Eike Stepper CLA 2011-06-23 03:40:30 EDT 
Available in R20110608-1407