Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Khouzam2012-06-12 18:51:32 +0000
committerMatthew Khouzam2012-06-12 18:52:21 +0000
commitceec1a8c36972813a14ff5ba3b11f539b4193ff2 (patch)
tree52ba5bda9b926434d30264a308fc5be15605b808
parentec78242b31c5f10eb59f4667dc4aefd0de9509ac (diff)
downloadorg.eclipse.linuxtools-ceec1a8c36972813a14ff5ba3b11f539b4193ff2.tar.gz
org.eclipse.linuxtools-ceec1a8c36972813a14ff5ba3b11f539b4193ff2.tar.xz
org.eclipse.linuxtools-ceec1a8c36972813a14ff5ba3b11f539b4193ff2.zip
Fix for the fix: Fix an error if a user forcefully reads after the
end of the trace. Signed-off-by: Matthew Khouzam <matthew.khouzam@ericsson.com>
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/ctfadaptor/CtfTmfTrace.java5
1 files changed, 1 insertions, 4 deletions
diff --git a/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/ctfadaptor/CtfTmfTrace.java b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/ctfadaptor/CtfTmfTrace.java
index 76280d1f86..32980e2595 100644
--- a/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/ctfadaptor/CtfTmfTrace.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/ctfadaptor/CtfTmfTrace.java
@@ -243,13 +243,10 @@ public class CtfTmfTrace extends TmfTrace<CtfTmfEvent> implements ITmfEventParse
public synchronized CtfTmfEvent getNext(final ITmfContext context) {
CtfTmfEvent event = null;
if (context instanceof CtfTmfLightweightContext) {
- if (CtfLocation.INVALID_LOCATION.equals(context.getLocation())) {
+ if (CtfLocation.INVALID_LOCATION.equals(context.getLocation().getLocation())) {
return null;
}
CtfTmfLightweightContext ctfContext = (CtfTmfLightweightContext) context;
- if( ctfContext.getLocation().equals(CtfLocation.INVALID_LOCATION)) {
- return null;
- }
event = ctfContext.getCurrentEvent();
if (event != null) {

Back to the top