Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 320485 - CDOMergingConflictResolver.resolveConflicts(*) always throws NPE
Summary: CDOMergingConflictResolver.resolveConflicts(*) always throws NPE
Status: CLOSED DUPLICATE of bug 319090
Alias: None
Product: EMF
Classification: Modeling
Component: cdo.core (show other bugs)
Version: 4.0   Edit
Hardware: All All
: P3 normal (vote)
Target Milestone: ---   Edit
Assignee: Project Inbox CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2010-07-21 06:56 EDT by Caspar D. CLA
Modified: 2010-07-22 02:09 EDT (History)
3 users (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 Caspar D. CLA 2010-07-21 06:56:12 EDT 
The last call in this method is:

  transaction.applyChangeSetData(result, null, null, null);

The last null argument matches the 'sourceInfo' parameter into
CDOTransactionImpl.applyChangeSetData(*), the 2nd line of which reads:

  if (sourceInfo.getBranchPoint().getBranch().isLocal())

Result: NullPointerException
Comment 1 Eike Stepper CLA 2010-07-22 02:09:56 EDT 
Bug 319090 is still under development ;-)

*** This bug has been marked as a duplicate of bug 319090 ***