Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 329990 - ConflictResolving only supports one savePoint
Summary: ConflictResolving only supports one savePoint
Status: NEW
Alias: None
Product: EMF
Classification: Modeling
Component: cdo.core (show other bugs)
Version: 4.13   Edit
Hardware: All All
: P3 normal (vote)
Target Milestone: ---   Edit
Assignee: Project Inbox CLA
QA Contact: Eike Stepper CLA
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2010-11-11 07:45 EST by Pascal Lehmann CLA
Modified: 2020-12-11 10:47 EST (History)
1 user (show)

See Also:

Attachments
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 Pascal Lehmann CLA 2010-11-11 07:45:44 EST 
If the dirty transaction consists of more than one savepoint, the getRevisionDeltas method will return a copy of the revision deltas, while the originals are returned in case there is only one savepoint.

All changes made to the passed revisionDeltas by the conflict resolver in the many savepoint case are made on the copy and do not end up in the transaction ,which will have the commit fail after conflict resolution (because the version doesn't match).

Maybe a list of Map<CDOID, CDORevisionDelta> (with the originals from each savepoint) should be passed to the resolveConflicts method?
Comment 1 Eike Stepper CLA 2012-06-05 07:29:33 EDT 
Moving all open bug reports to 4.1 because the release is very near and it's hghly unlikely that there will be spare time to address 4.0 problems.

Please make sure that your patches can be applied against the master branch and that your problem is not already fixed there!!!
Comment 2 Eike Stepper CLA 2012-08-14 22:53:01 EDT 
Moving all open issues to 4.2. Open bugs can be ported to 4.1 maintenance after they've been fixed in master.
Comment 3 Eike Stepper CLA 2013-06-29 12:18:50 EDT 
We'll try to address open problems in 4.3 (master) first and then port fixes back to 4.2.
Comment 4 Eike Stepper CLA 2015-07-14 02:13:55 EDT 
Moving all open bugzillas to 4.5.
Comment 5 Eike Stepper CLA 2016-07-31 00:56:57 EDT 
Moving all unaddressed bugzillas to 4.6.
Comment 6 Eike Stepper CLA 2017-12-28 01:20:34 EST 
Moving all open bugs to 4.7
Comment 7 Eike Stepper CLA 2019-11-08 02:14:14 EST 
Moving all unresolved issues to version 4.8-
Comment 8 Eike Stepper CLA 2019-12-13 12:52:28 EST 
Moving all unresolved issues to version 4.9
Comment 9 Eike Stepper CLA 2020-12-11 10:47:31 EST 
Moving to 4.13.