From 0e8c76f83f28a55faee1f14d16fd40c53abb3ea1 Mon Sep 17 00:00:00 2001
From: Bernd Hufmann <bhufmann@gmail.com>
Date: Wed, 6 Jun 2012 17:47:57 -0400
Subject: [PATCH] Fix for NPE after disposing an experiment (Bug 381412)

---
 .../eclipse/linuxtools/tmf/core/trace/TmfExperiment.java    | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfExperiment.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfExperiment.java
index 4cdbbc1889..d1bdf76ee1 100644
--- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfExperiment.java
+++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfExperiment.java
@@ -392,6 +392,12 @@ public class TmfExperiment<T extends ITmfEvent> extends TmfTrace<T> implements I
         if (!(context instanceof TmfExperimentContext)) {
             return null; // Throw an exception?
         }
+
+        // Make sure that we have something to read from
+        if (fTraces == null) {
+            return null;
+        }
+
         TmfExperimentContext expContext = (TmfExperimentContext) context;
 
         // If an event was consumed previously, first get the next one from that trace
-- 
2.34.1