Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Tasse2012-07-13 13:15:23 -0400
committerPatrick Tasse2012-07-13 14:12:18 -0400
commit91746de3f9f4330dfa59268c390d496f6ef59bb7 (patch)
tree9b4519d88d27cf048b7e3b7c5a99da60d9b4eb0f
parent3689b45fe84ec90393007e9bc31413daeeb78cb2 (diff)
downloadorg.eclipse.linuxtools-91746de3f9f4330dfa59268c390d496f6ef59bb7.tar.gz
org.eclipse.linuxtools-91746de3f9f4330dfa59268c390d496f6ef59bb7.tar.xz
org.eclipse.linuxtools-91746de3f9f4330dfa59268c390d496f6ef59bb7.zip
Fix for bug 384637: NullPointerException in ControlFlowView on disposed
experiment during state system build. Change-Id: I26b66db4650404ea06fa1586cf348b0aefd78656
-rw-r--r--lttng/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/views/controlflow/ControlFlowView.java4
-rw-r--r--lttng/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/views/resources/ResourcesView.java2
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()) {

Back to the top