commit | fb48437314396d49fec95f0df1546ac4111f2695 | [log] [tgz] |
---|---|---|
author | Wim Jongman <wim.jongman@remainsoftware.com> | Mon Dec 17 09:40:05 2012 +0100 |
committer | Wim Jongman <wim.jongman@remainsoftware.com> | Mon Dec 17 09:40:05 2012 +0100 |
tree | cae7ce871d7a09a06fc481e77881e4e8eff097b9 | |
parent | c5d507c20f0c13f4174b5121415a6b31e7356f2c [diff] |
bug 396717: NPE in PatternFilter https://bugs.eclipse.org/bugs/show_bug.cgi?id=395174
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PatternFilter.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PatternFilter.java index 9e82fb4..4695375 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PatternFilter.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PatternFilter.java
@@ -45,7 +45,9 @@ if (labelProvider instanceof ILabelProvider) { labelText = ((ILabelProvider) labelProvider).getText(element); } else { - labelText = element.toString(); + if (element != null) { + labelText = element.toString(); + } } if (labelText == null) {