From b626c6f7b8b5149299b952e7b67c396a12cf711a Mon Sep 17 00:00:00 2001
From: Bernd Hufmann <bhufmann@gmail.com>
Date: Tue, 30 Aug 2011 11:35:40 -0400
Subject: [PATCH] Fix for bug 356216 (Kernel state system not initialized)

---
 .../linuxtools/lttng/state/trace/StateTraceManager.java      | 5 +++--
 .../org/eclipse/linuxtools/lttng/trace/LTTngExperiment.java  | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/trace/StateTraceManager.java b/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/trace/StateTraceManager.java
index 9679f0c1f1..4f33751c43 100644
--- a/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/trace/StateTraceManager.java
+++ b/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/trace/StateTraceManager.java
@@ -199,8 +199,9 @@ public class StateTraceManager extends LTTngTreeNode implements IStateTraceManag
 		TmfCheckpoint checkpoint = new TmfCheckpoint(fTrace.getStartTime(), new TmfLocation<Long>(0L));
 
 		// The GUI can have time limits higher than this log, since GUI can
-		// handle multiple logs
-		if ((eventTime.getValue() < 0) || (eventTime.getValue() > experimentRange.getEndTime().getValue())) {
+		// handle multiple logs. Ignore special null value of experiment time range.
+        if ((eventTime.getValue() < 0) || 
+                (!experimentRange.equals(TmfTimeRange.Null) && (eventTime.getValue() > experimentRange.getEndTime().getValue()))) {
 			return null;
 		}
 
diff --git a/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/trace/LTTngExperiment.java b/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/trace/LTTngExperiment.java
index ac5fe82418..d3be8af1a0 100644
--- a/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/trace/LTTngExperiment.java
+++ b/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/trace/LTTngExperiment.java
@@ -250,7 +250,7 @@ public class LTTngExperiment<T extends TmfEvent> extends TmfExperiment<T> implem
                     try {
                         sendRequest((ITmfDataRequest<T>) request);
                         request.waitForCompletion();
-                        if (timeRange != null && timeRange != TmfTimeRange.Null) {
+                        if (timeRange != null && !timeRange.equals(TmfTimeRange.Null)) {
                             TmfExperimentRangeUpdatedSignal signal = new TmfExperimentRangeUpdatedSignal(LTTngExperiment.this, LTTngExperiment.this,
                                     timeRange);
                             broadcast(signal);
-- 
2.34.1