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

Bug 320485

Summary: CDOMergingConflictResolver.resolveConflicts(*) always throws NPE
Product: [Modeling] EMF Reporter: Caspar D. <caspar_d>
Component: cdo.coreAssignee: Project Inbox <emf.cdo-inbox>
Status: CLOSED DUPLICATE QA Contact:
Severity: normal    
Priority: P3 CC: cyril.jaquier, saulius.tvarijonas, stepper
Version: 4.0   
Target Milestone: ---   
Hardware: All   
OS: All   
Whiteboard:

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 ***