From: Bernd Hufmann <bhufmann@gmail.com>
Date: Fri, 7 Sep 2012 18:41:46 +0000 (-0400)
Subject: Merge branch 'master' into lttng-kepler
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=82cbc173f13cd74135f669f0f9b9f20519981215;p=deliverable%2Ftracecompass.git

Merge branch 'master' into lttng-kepler

Conflicts:
	lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/ctfadaptor/CtfTmfTrace.java

Change-Id: Ia7e1b8a4cb52d9839f1f6d43d77074e08bcf464f
Signed-off-by: Bernd Hufmann <bhufmann@gmail.com>
---

82cbc173f13cd74135f669f0f9b9f20519981215
diff --cc org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/ctfadaptor/CtfTmfTrace.java
index d443bec8ab,f0f0b1b837..55ad3b8ed1
--- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/ctfadaptor/CtfTmfTrace.java
+++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/ctfadaptor/CtfTmfTrace.java
@@@ -89,9 -88,9 +89,9 @@@ public class CtfTmfTrace extends TmfTra
              CtfIteratorManager.addTrace(this);
              CtfTmfLightweightContext ctx;
              /* Set the start and (current) end times for this trace */
 -            ctx = new CtfTmfLightweightContext(this);
 -            ctx.setLocation(new CtfLocation(0L));
 +            ctx = (CtfTmfLightweightContext) seekEvent(0L);
 +            CtfTmfEvent event = getNext(ctx);
-             if(ctx.getLocation().equals(CtfIterator.NULL_LOCATION)) {
+             if((ctx.getLocation().equals(CtfIterator.NULL_LOCATION)) || (ctx.getCurrentEvent() == null)) {
                  /* Handle the case where the trace is empty */
                  this.setStartTime(TmfTimestamp.BIG_BANG);
              } else {