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>

diff --cc org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/ctfadaptor/CtfTmfTrace.java
index d443bec8abb9683c37719efc726aa60a85737c44,f0f0b1b837a359ffd3d59cf61ed3b862cfa9e006..55ad3b8ed1a06b8ac555924ab6b5f37ba37d9f27
--- 1/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/ctfadaptor/CtfTmfTrace.java
--- 2/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 {