commit	be76e187fcd1e3405bb7d4b74c6c46d067eb6f88	[log] [tgz]
author	Philip Langer <planger@eclipsesource.com>	Thu Oct 19 15:41:53 2017 +0200
committer	Philip Langer <planger@eclipsesource.com>	Mon Nov 20 15:56:30 2017 +0100
tree	af2f795c1228d1b41934099067ce76e84748962b
parent	40221a4d267017098a82d62aad93e2fdee684710 [diff]

NPE in PapyrusMergeViewerItemContentProvider.getParent

For an addition to a containment reference that's rejected, the match
ends up being modified so that all three sides are null, and that causes
a null pointer exception.

Change-Id: I76a822dee39880e61a72734e44c57805918390fb
Signed-off-by: Philip Langer <planger@eclipsesource.com>

plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/provider/PapyrusMergeViewerItemContentProvider.java[diff]

1 file changed

tree: af2f795c1228d1b41934099067ce76e84748962b

README.MD

Papyrus Collaborative Modeling

This is the collaborative modeling git repository

This repository is hosted at [Eclipse] (http://git.eclipse.org/c/papyrus/org.eclipse.papyrus-collaborativemodeling.git/)