diff options
| author | Michael Keppler | 2019-07-23 09:18:52 +0000 |
|---|---|---|
| committer | Michael Keppler | 2019-07-23 09:18:52 +0000 |
| commit | d71c0750f068c6c180238f264d142dbf7f83cb2f (patch) | |
| tree | b4c327994e6efac2fecd709d1eb5e1f63dbb6add | |
| parent | a484b7e7f56a96e49cb8f6beec2d55936088a20a (diff) | |
| download | org.eclipse.emf.compare-3.3.8M3.tar.gz org.eclipse.emf.compare-3.3.8M3.tar.xz org.eclipse.emf.compare-3.3.8M3.zip | |
549477 - NPE in TreeNodeItemProviderSpec.getChildren3.3.8M3
Add a guard condition to handle missing difference group provider more
gracefully.
Bug: 549477
Change-Id: I8a84dce5c6df8694d79b520fdf43b6e900197492
Signed-off-by: Michael Keppler <michael.keppler@gmx.de>
| -rw-r--r-- | plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/provider/TreeNodeItemProviderSpec.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/provider/TreeNodeItemProviderSpec.java b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/provider/TreeNodeItemProviderSpec.java index 3426e7795..74d746f4b 100644 --- a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/provider/TreeNodeItemProviderSpec.java +++ b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/provider/TreeNodeItemProviderSpec.java @@ -114,6 +114,9 @@ public class TreeNodeItemProviderSpec extends TreeNodeItemProvider implements II if (data instanceof Comparison) { IDifferenceGroupProvider groupProvider = (IDifferenceGroupProvider)EcoreUtil .getExistingAdapter(treeNode, IDifferenceGroupProvider.class); + if (groupProvider == null) { + return ImmutableList.of(); + } Comparison comparison = (Comparison)data; Collection<? extends IDifferenceGroup> groups = groupProvider.getGroups(comparison); if (groups.isEmpty()) { |