From: Patrick Tasse <patrick.tasse@gmail.com>
Date: Thu, 18 Feb 2016 16:29:14 +0000 (-0500)
Subject: tmf: Bug 488042: TmfStatisticsModule returns null in @NonNull interface
X-Git-Url: http://git.efficios.com/?a=commitdiff_plain;h=11b771eb1b92e141625b47f38912d74fd8c98d0e;p=deliverable%2Ftracecompass.git

tmf: Bug 488042: TmfStatisticsModule returns null in @NonNull interface

Change-Id: I65f1d5fb0176b57182abdd01a4e7f3e533097812
Signed-off-by: Patrick Tasse <patrick.tasse@gmail.com>
Reviewed-on: https://git.eclipse.org/r/66850
Reviewed-by: Hudson CI
Reviewed-by: Alexandre Montplaisir <alexmonthy@efficios.com>
---

diff --git a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/statesystem/TmfStateSystemAnalysisModule.java b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/statesystem/TmfStateSystemAnalysisModule.java
index 28ff148872..83ab1ceecf 100644
--- a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/statesystem/TmfStateSystemAnalysisModule.java
+++ b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/statesystem/TmfStateSystemAnalysisModule.java
@@ -540,7 +540,7 @@ public abstract class TmfStateSystemAnalysisModule extends TmfAbstractAnalysisMo
     }
 
     @Override
-    public Iterable<ITmfStateSystem> getStateSystems() {
+    public @NonNull Iterable<@NonNull ITmfStateSystem> getStateSystems() {
         ITmfStateSystemBuilder stateSystem = fStateSystem;
         if (stateSystem == null) {
             return Collections.EMPTY_SET;
diff --git a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/statistics/TmfStatisticsModule.java b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/statistics/TmfStatisticsModule.java
index 746a892da3..1996a05abf 100644
--- a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/statistics/TmfStatisticsModule.java
+++ b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/statistics/TmfStatisticsModule.java
@@ -189,10 +189,16 @@ public class TmfStatisticsModule extends TmfAbstractAnalysisModule
     }
 
     @Override
-    public Iterable<ITmfStateSystem> getStateSystems() {
-        List<ITmfStateSystem> list = new LinkedList<>();
-        list.add(totalsModule.getStateSystem());
-        list.add(eventTypesModule.getStateSystem());
+    public @NonNull Iterable<@NonNull ITmfStateSystem> getStateSystems() {
+        List<@NonNull ITmfStateSystem> list = new LinkedList<>();
+        ITmfStateSystem totalsStateSystem = totalsModule.getStateSystem();
+        if (totalsStateSystem != null) {
+            list.add(totalsStateSystem);
+        }
+        ITmfStateSystem eventTypesStateSystem = eventTypesModule.getStateSystem();
+        if (eventTypesStateSystem != null) {
+            list.add(eventTypesStateSystem);
+        }
         return list;
     }
 }