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

Bug 335808

Summary: CDOMergingConflictResolver throws NPE on refresh (& passiveUpdates=false)
Product: [Modeling] EMF Reporter: Caspar D. <caspar_d>
Component: cdo.coreAssignee: Eike Stepper <stepper>
Status: NEW --- QA Contact: Eike Stepper <stepper>
Severity: normal    
Priority: P3 CC: saulius.tvarijonas, stepper
Version: 4.13   
Target Milestone: ---   
Hardware: All   
OS: All   
Whiteboard:
Attachments:
Description Flags
Testcases (as a patch) none

Description Caspar D. CLA 2011-01-31 02:16:44 EST 
When refresh is called on a session with passiveUpdates disabled,
an NPE occurs because the 'aggregator' contains no changeSetData:

java.lang.NullPointerException
	at org.eclipse.emf.cdo.internal.common.commit.CDOChangeSetImpl.<init>(CDOChangeSetImpl.java:29)
	at org.eclipse.emf.cdo.common.revision.CDORevisionUtil.createChangeSet(CDORevisionUtil.java:238)
	at org.eclipse.emf.spi.cdo.AbstractChangeSetsConflictResolver.getRemoteChangeSet(AbstractChangeSetsConflictResolver.java:90)
	at org.eclipse.emf.spi.cdo.CDOMergingConflictResolver.resolveConflicts(CDOMergingConflictResolver.java:57)
	at org.eclipse.emf.internal.cdo.transaction.CDOTransactionImpl.handleConflicts(CDOTransactionImpl.java:682)
	at org.eclipse.emf.internal.cdo.view.CDOViewImpl.doInvalidate(CDOViewImpl.java:401)
	at org.eclipse.emf.internal.cdo.view.CDOViewImpl.invalidate(CDOViewImpl.java:374)
	at org.eclipse.emf.internal.cdo.session.CDOSessionImpl.processRefreshSessionResult(CDOSessionImpl.java:769)
	at org.eclipse.emf.internal.cdo.session.CDOSessionImpl.refresh(CDOSessionImpl.java:731)
	at org.eclipse.emf.internal.cdo.session.CDOSessionImpl.refresh(CDOSessionImpl.java:705)
Comment 1 Caspar D. CLA 2011-01-31 02:19:53 EST 
Created attachment 187927 [details]
Testcases (as a patch)
Comment 2 Eike Stepper CLA 2011-02-03 07:43:37 EST 
CDOMergingConflictResolver is currently broken. I've marked it deprecated to indicate that I did not manage to fix it in time for M5. Checking again later...
Comment 3 Caspar D. CLA 2011-03-23 02:47:57 EDT 
Is this still a work in progress? Or a work abandoned?
Comment 4 Eike Stepper CLA 2011-03-23 16:56:18 EDT 
I did not manage, yet, to look at it again. But I want to do it as soon as possible. Probably some time in April.
Comment 5 Eike Stepper CLA 2012-06-05 07:29:05 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 6 Eike Stepper CLA 2012-08-14 22:55:32 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 7 Eike Stepper CLA 2013-06-29 12:16:33 EDT 
We'll try to address open problems in 4.3 (master) first and then port fixes back to 4.2.
Comment 8 Eike Stepper CLA 2015-07-14 02:18:06 EDT 
Moving all open bugzillas to 4.5.
Comment 9 Eike Stepper CLA 2016-07-31 01:00:58 EDT 
Moving all unaddressed bugzillas to 4.6.
Comment 10 Eike Stepper CLA 2017-12-28 01:11:01 EST 
Moving all open bugs to 4.7
Comment 11 Eike Stepper CLA 2019-11-08 02:18:15 EST 
Moving all unresolved issues to version 4.8-
Comment 12 Eike Stepper CLA 2019-12-13 12:53:39 EST 
Moving all unresolved issues to version 4.9
Comment 13 Eike Stepper CLA 2020-12-11 10:43:36 EST 
Moving to 4.13.