Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 332264 - CDOMergingConflictResolver does not work with multiple commits
Summary: CDOMergingConflictResolver does not work with multiple commits
Status: CLOSED FIXED
Alias: None
Product: EMF
Classification: Modeling
Component: cdo.core (show other bugs)
Version: 4.0   Edit
Hardware: PC Linux
: P3 normal (vote)
Target Milestone: ---   Edit
Assignee: Pascal Lehmann CLA
QA Contact: Eike Stepper CLA
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2010-12-09 18:29 EST by Lothar Werzinger CLA
Modified: 2011-06-23 03:40 EDT (History)
1 user (show)

See Also:
stepper: review+

Attachments
patch for unit test (3.56 KB, patch)
2010-12-09 18:30 EST, Lothar Werzinger CLA 		stepper: iplog+
Details | Diff
Patch v1 (1.38 KB, patch)
2010-12-10 07:02 EST, Pascal Lehmann CLA 		no flags Details | Diff
Cobined patch - ready to be committed (5.99 KB, patch)
2010-12-10 07:07 EST, Eike Stepper CLA 		no flags Details | Diff
Show Obsolete (2) View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
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