Fix NPE on trace with obsolete persistent properties

Change-Id: Ic867f89b2446e60f5aca75e7fb563045950334fc
Signed-off-by: Patrick Tasse <patrick.tasse@gmail.com>
Reviewed-on: https://git.eclipse.org/r/13302
Tested-by: Hudson CI
Reviewed-by: Bernd Hufmann <bernd.hufmann@ericsson.com>
IP-Clean: Bernd Hufmann <bernd.hufmann@ericsson.com>

diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfNavigatorLabelProvider.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfNavigatorLabelProvider.java
index 3e25989d32ca760062ddb7af267198f52772e4b4..a420a41e76382a243f4364f5f558e63b8c82f356 100644 (file)
--- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfNavigatorLabelProvider.java
+++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfNavigatorLabelProvider.java
@@ -80,8 +80,10 @@ public class TmfNavigatorLabelProvider implements ICommonLabelProvider {
         if (icon == null) {
             URL imageURL = bundle.getResource(url);
             ImageDescriptor descriptor = ImageDescriptor.createFromURL(imageURL);
-            icon = descriptor.createImage();
-            plugin.getImageRegistry().put(key, icon);
+            if (descriptor != null) {
+                icon = descriptor.createImage();
+                plugin.getImageRegistry().put(key, icon);
+            }
         }
         return icon;
     }
@@ -103,7 +105,13 @@ public class TmfNavigatorLabelProvider implements ICommonLabelProvider {
                 String icon = trace.getResource().getPersistentProperty(TmfCommonConstants.TRACEICON);
                 if (name != null && icon != null) {
                     Bundle bundle = Platform.getBundle(name);
-                    return loadIcon(bundle, icon);
+                    if (bundle != null) {
+                        Image image = loadIcon(bundle, icon);
+                        if (image != null) {
+                            return image;
+                        }
+                    }
+                    return fUnknownTraceIcon;
                 }
             } catch (CoreException e) {
             }