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

Bug 346955

Summary: NPE on save after a merge al
Product: [Modeling] EMFCompare Reporter: Mikaël Barbero <mikael.barbero>
Component: CoreAssignee: EMF Compare <emf.compare-inbox>
Status: CLOSED FIXED QA Contact:
Severity: critical    
Priority: P3 CC: laurent.goubet, mikael.barbero
Version: unspecified   
Target Milestone: ---   
Hardware: PC   
OS: Linux   
Whiteboard:

Description Mikaël Barbero CLA 2011-05-24 05:57:26 EDT 
When I'm trying to save resources after having merge all differences, a NPE i thrown from ModelContentMergeViewer.getContents(boolean) on resource.save(stream, null);

It seems that the change detection in ModelContentMergeContentProvider.hasChanged() called by ModelContentMergeContentProvider.get[Left/Right]Content(Object) is relying on the some subdiff in DiffModels...
Comment 1 Laurent Goubet CLA 2011-05-24 08:30:47 EDT 
This will happen whenever _all_ differences have been merged from the compare UI and the user tries to save the changes.

This fix is trivial and it will be present in the RC3 build.