diff options
| author | Axel Richard | 2015-09-01 08:49:34 +0000 |
|---|---|---|
| committer | Axel Richard | 2015-09-01 08:51:38 +0000 |
| commit | 9e005ef8b3318b16ddee5121346b53288eaf6b1a (patch) | |
| tree | d205c9fafbae4080a016f86ddf4be11958e21c0b | |
| parent | 26b2974f9a8f6161c9e1ec1df57a58ef48ccee32 (diff) | |
| download | org.eclipse.emf.compare-9e005ef8b3318b16ddee5121346b53288eaf6b1a.tar.gz org.eclipse.emf.compare-9e005ef8b3318b16ddee5121346b53288eaf6b1a.tar.xz org.eclipse.emf.compare-9e005ef8b3318b16ddee5121346b53288eaf6b1a.zip | |
Fix NPE in TreeNodeCompareInputLabelProvider3.1.1RC2
This NPE has been fixed in master, in the commit f782572 Add new UML
Dangling Stereotype Application concept, which can't be backported in
3.1.
Change-Id: Idc672d860896f0a10e91014e3bf6fa6c4682827f
Signed-off-by: Axel Richard <axel.richard@obeo.fr>
| -rw-r--r-- | plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/provider/TreeNodeCompareInputLabelProvider.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/provider/TreeNodeCompareInputLabelProvider.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/provider/TreeNodeCompareInputLabelProvider.java index 20e269140..a0b7362d8 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/provider/TreeNodeCompareInputLabelProvider.java +++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/provider/TreeNodeCompareInputLabelProvider.java @@ -200,9 +200,11 @@ public class TreeNodeCompareInputLabelProvider implements ICompareInputLabelProv } private StoragePathAdapter getStoragePathAdapter(Resource resource) { - for (Adapter adapter : resource.eAdapters()) { - if (adapter instanceof StoragePathAdapter) { - return (StoragePathAdapter)adapter; + if (resource != null) { + for (Adapter adapter : resource.eAdapters()) { + if (adapter instanceof StoragePathAdapter) { + return (StoragePathAdapter)adapter; + } } } return null; |