diff options
| -rw-r--r-- | plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewerContentProvider.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewerContentProvider.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewerContentProvider.java index 68d08db15..a7658d956 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewerContentProvider.java +++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewerContentProvider.java @@ -311,8 +311,13 @@ class EMFCompareStructureMergeViewerContentProvider extends AdapterFactoryConten if (!isPartOfTree.apply((Diff)object)) { if (object instanceof ReferenceChange && ((ReferenceChange)object).getReference().isContainment()) { - ret = Iterables.any(((Diff)object).getMatch().getComparison().getMatch( - ((ReferenceChange)object).getValue()).getAllDifferences(), isPartOfTree); + Match match = ((Diff)object).getMatch().getComparison().getMatch( + ((ReferenceChange)object).getValue()); + if (match != null) { + ret = Iterables.any(match.getAllDifferences(), isPartOfTree); + } else { + ret = false; + } } } else { ret = true; |