1 files changed, 4 insertions, 3 deletions
diff --git a/lttng/org.eclipse.linuxtools.tmf.ctf.core/src/org/eclipse/linuxtools/tmf/ctf/core/CtfTmfContext.java b/lttng/org.eclipse.linuxtools.tmf.ctf.core/src/org/eclipse/linuxtools/tmf/ctf/core/CtfTmfContext.java
index 991049445f..0825b84f2f 100644
--- a/lttng/org.eclipse.linuxtools.tmf.ctf.core/src/org/eclipse/linuxtools/tmf/ctf/core/CtfTmfContext.java
+++ b/lttng/org.eclipse.linuxtools.tmf.ctf.core/src/org/eclipse/linuxtools/tmf/ctf/core/CtfTmfContext.java
@@ -126,11 +126,12 @@ public class CtfTmfContext implements ITmfContext {
      */
     public synchronized boolean advance() {
         final CtfLocationInfo curLocationData = fCurLocation.getLocationInfo();
-        boolean retVal = getIterator().advance();
-        CtfTmfEvent currentEvent = getIterator().getCurrentEvent();
+        CtfIterator iterator = getIterator();
+        boolean retVal = iterator.advance();
+        CtfTmfEvent currentEvent = iterator.getCurrentEvent();
 
         if (currentEvent != null) {
-            final long timestampValue = currentEvent.getTimestamp().getValue();
+            final long timestampValue = iterator.getCurrentTimestamp();
             if (curLocationData.getTimestamp() == timestampValue) {
                 fCurLocation = new CtfLocation(timestampValue, curLocationData.getIndex() + 1);
             } else {