tmf: Bug 517665: Fix NPE when renaming trace that is in an experiment

Change-Id: I479ed462161bbec95ad84142f7b90ca4b337e66b
Signed-off-by: Bernd Hufmann <Bernd.Hufmann@ericsson.com>
Reviewed-on: https://git.eclipse.org/r/98466
Tested-by: Patrick Tasse <patrick.tasse@gmail.com>
Reviewed-by: Hudson CI
Reviewed-by: Patrick Tasse <patrick.tasse@gmail.com>

diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/project/model/TmfCommonProjectElement.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/project/model/TmfCommonProjectElement.java
index a2818cba5b380a7edbab89707cf8f98d9ff23038..da11f02bbddb90ac3cc0ab2efd4f71b9810fe530 100644 (file)
--- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/project/model/TmfCommonProjectElement.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/project/model/TmfCommonProjectElement.java
@@ -431,9 +431,13 @@ public abstract class TmfCommonProjectElement extends TmfProjectModelElement {
      * @return Array of analysis elements
      */
     public List<@NonNull TmfAnalysisElement> getAvailableAnalysis() {
-        return getChildElementViews().getChildren().stream()
-            .map(elem -> (TmfAnalysisElement) elem)
-            .collect(Collectors.toList());
+        TmfViewsElement viewsElement = getChildElementViews();
+        if (viewsElement != null) {
+            return viewsElement.getChildren().stream()
+                    .map(elem -> (TmfAnalysisElement) elem)
+                    .collect(Collectors.toList());
+        }
+        return Collections.EMPTY_LIST;
     }
 
     /**

diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/project/model/TmfExperimentElement.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/project/model/TmfExperimentElement.java
index 93fd2e22d3b0f80bfecd40bf4b6f6a27b4acd4f7..87e07fc0d382de09c22ee6514c74d0fa223d69a7 100644 (file)
--- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/project/model/TmfExperimentElement.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/project/model/TmfExperimentElement.java
@@ -415,10 +415,9 @@ public class TmfExperimentElement extends TmfCommonProjectElement implements IPr
         });
 
         /* Remove all trace analyses from experiment view */
-        List<@NonNull TmfAnalysisElement> analysisElements = trace.getElementUnderTraceFolder().getAvailableAnalysis();
         TmfViewsElement view = getChildElementViews();
-
         if (view != null) {
+            List<@NonNull TmfAnalysisElement> analysisElements = trace.getElementUnderTraceFolder().getAvailableAnalysis();
             view.removeChildrenAnalysis(analysisElements);
         }