tmf: Bug 436751: NPE deleting unexpanded Tracing project

Change-Id: Id3e7cb3cf7152a2e841366c7e3b90853236b9542
Signed-off-by: Patrick Tasse <patrick.tasse@gmail.com>
Reviewed-on: https://git.eclipse.org/r/28081
Tested-by: Hudson CI
(cherry picked from commit c9137e1c8cfb59bbe57677279b992f5ba0cfa864)
Reviewed-on: https://git.eclipse.org/r/28132

diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfProjectRegistry.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfProjectRegistry.java
index 6c0829a40d27209759372080ef773809d327ff94..2cc37f4a82e88c05ea4429264e66be26cfafbdfb 100644 (file)
--- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfProjectRegistry.java
+++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfProjectRegistry.java
@@ -160,8 +160,11 @@ public class TmfProjectRegistry implements IResourceChangeListener {
             if (event.getResource() instanceof IProject) {
                 IProject project = (IProject) event.getResource();
                 try {
-                    if (project.hasNature(TmfProjectNature.ID)) {
+                    if (project.isAccessible() && project.hasNature(TmfProjectNature.ID)) {
                         TmfProjectElement tmfProjectElement = registry.get(project);
+                        if (tmfProjectElement == null) {
+                            return;
+                        }
                         final List<TmfTraceElement> traces = tmfProjectElement.getTracesFolder().getTraces();
                         if (!traces.isEmpty()) {
                             // Close editors in UI Thread