diff options
| author | Mathieu Cartaud | 2015-11-04 13:20:16 +0000 |
|---|---|---|
| committer | Mathieu Cartaud | 2015-11-04 13:20:16 +0000 |
| commit | 1b2326d07037167d12f191883ae59bbfccc17d10 (patch) | |
| tree | 1d729ffc966d30f1d25669fda8445b154da49b7c | |
| parent | 0f040eee6a5e1cffe8df67f27683301a3f9424ba (diff) | |
| download | org.eclipse.emf.compare-1b2326d07037167d12f191883ae59bbfccc17d10.tar.gz org.eclipse.emf.compare-1b2326d07037167d12f191883ae59bbfccc17d10.tar.xz org.eclipse.emf.compare-1b2326d07037167d12f191883ae59bbfccc17d10.zip | |
[475935] Fix potential IllegalStateException in MergeViewerItem
Bug: 475935
Change-Id: I7e112c146bc43cca8a3b57c173af9584d00b6a8c
Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>
| -rw-r--r-- | plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/mergeviewer/item/impl/MergeViewerItem.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/mergeviewer/item/impl/MergeViewerItem.java b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/mergeviewer/item/impl/MergeViewerItem.java index 096055502..5358e5e1d 100644 --- a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/mergeviewer/item/impl/MergeViewerItem.java +++ b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/mergeviewer/item/impl/MergeViewerItem.java @@ -314,7 +314,7 @@ public class MergeViewerItem extends AdapterImpl implements IMergeViewerItem { private Iterable<? extends Diff> getDiffsWithValue(EObject expectedValue, Match parentMatch) { Iterable<? extends Diff> diffs = filter(fComparison.getDifferences(expectedValue), CONTAINMENT_REFERENCE_CHANGE); - if (size(diffs) > 1) { + if (size(diffs) > 1 && fSide != MergeViewerSide.ANCESTOR) { diffs = filter(diffs, fromSide(fSide.convertToDifferenceSource())); if (size(diffs) > 1) { throw new IllegalStateException( |