From 77551cc207c70e6d2acc4acb831551fcbf9a2e18 Mon Sep 17 00:00:00 2001
From: Francois Chouinard <fchouinard@gmail.com>
Date: Thu, 31 May 2012 16:22:59 -0400
Subject: [PATCH] Fix NPE when indexer wasn't instantiated

---
 .../eclipse/linuxtools/tmf/core/trace/TmfExperiment.java    | 6 ++++--
 .../src/org/eclipse/linuxtools/tmf/core/trace/TmfTrace.java | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

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 4b23e55eb2..ef74f27b99 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
@@ -131,8 +131,10 @@ public class TmfExperiment<T extends ITmfEvent> extends TmfTrace<T> implements I
             fCurrentExperiment = null;
         }
 
-        // Clean up the index
-        getIndexer().dispose();
+        // Clean up the index if applicable
+        if (getIndexer() != null) {
+            getIndexer().dispose();
+        }
 
         if (fTraces != null) {
             for (final ITmfTrace trace : fTraces)
diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfTrace.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfTrace.java
index f17faab4bd..3303c6ba8b 100644
--- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfTrace.java
+++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfTrace.java
@@ -251,8 +251,10 @@ public abstract class TmfTrace<T extends ITmfEvent> extends TmfEventProvider<T>
      */
     @Override
     public synchronized void dispose() {
-        // Clean up the index
-        getIndexer().dispose();
+        // Clean up the index if applicable
+        if (getIndexer() != null) {
+            getIndexer().dispose();
+        }
         super.dispose();
     }
 
-- 
2.34.1