Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 346955 - NPE on save after a merge al
Summary: NPE on save after a merge al
Status: CLOSED FIXED
Alias: None
Product: EMFCompare
Classification: Modeling
Component: Core (show other bugs)
Version: unspecified   Edit
Hardware: PC Linux
: P3 critical (vote)
Target Milestone: ---   Edit
Assignee: EMF Compare CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2011-05-24 05:57 EDT by Mikaël Barbero CLA
Modified: 2011-05-24 08:30 EDT (History)
2 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 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.