From 91746de3f9f4330dfa59268c390d496f6ef59bb7 Mon Sep 17 00:00:00 2001
From: Patrick Tasse
Date: Fri, 13 Jul 2012 13:15:23 -0400
Subject: Fix for bug 384637: NullPointerException in ControlFlowView on
 disposed experiment during state system build.

Change-Id: I26b66db4650404ea06fa1586cf348b0aefd78656
---
 .../internal/lttng2/kernel/ui/views/controlflow/ControlFlowView.java  | 4 ++--
 .../internal/lttng2/kernel/ui/views/resources/ResourcesView.java      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lttng/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/views/controlflow/ControlFlowView.java b/lttng/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/views/controlflow/ControlFlowView.java
index 8c1aaa0d18..fe9cb3f4c6 100644
--- a/lttng/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/views/controlflow/ControlFlowView.java
+++ b/lttng/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/views/controlflow/ControlFlowView.java
@@ -434,7 +434,7 @@ public class ControlFlowView extends TmfView {
      */
     @TmfSignalHandler
     public void synchToTime(final TmfTimeSynchSignal signal) {
-        if (signal.getSource() == this || fSelectedExperiment == null) {
+        if (signal.getSource() == this || fSelectedExperiment == null || fSelectedExperiment.getTraces() == null) {
             return;
         }
         final long time = signal.getCurrentTime().normalize(0, -9).getValue();
@@ -534,7 +534,7 @@ public class ControlFlowView extends TmfView {
     @TmfSignalHandler
     public void stateSystemBuildCompleted (final TmfStateSystemBuildCompleted signal) {
         final TmfExperiment<?> selectedExperiment = fSelectedExperiment;
-        if (selectedExperiment == null) {
+        if (selectedExperiment == null || selectedExperiment.getTraces() == null) {
             return;
         }
         for (ITmfTrace<?> trace : selectedExperiment.getTraces()) {
diff --git a/lttng/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/views/resources/ResourcesView.java b/lttng/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/views/resources/ResourcesView.java
index c7c522b8d6..b17f5c066f 100644
--- a/lttng/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/views/resources/ResourcesView.java
+++ b/lttng/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/views/resources/ResourcesView.java
@@ -423,7 +423,7 @@ public class ResourcesView extends TmfView {
     @TmfSignalHandler
     public void stateSystemBuildCompleted (final TmfStateSystemBuildCompleted signal) {
         final TmfExperiment<?> selectedExperiment = fSelectedExperiment;
-        if (selectedExperiment == null) {
+        if (selectedExperiment == null || selectedExperiment.getTraces() == null) {
             return;
         }
         for (ITmfTrace<?> trace : selectedExperiment.getTraces()) {
-- 
cgit v1.2.3