Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Khouzam2012-06-12 18:51:32 +0000
committerMatthew Khouzam2012-06-12 18:54:24 +0000
commit83f4b09dcf0748da1333659a72e832dffbed182c (patch)
tree032de1e979c9faa57f864eae1013888ffac7e7f8 /lttng/org.eclipse.linuxtools.tmf.core
parent99bce5a58cc91867ac3a8c21b9bb1cf0aca8f79d (diff)
downloadorg.eclipse.linuxtools-83f4b09dcf0748da1333659a72e832dffbed182c.tar.gz
org.eclipse.linuxtools-83f4b09dcf0748da1333659a72e832dffbed182c.tar.xz
org.eclipse.linuxtools-83f4b09dcf0748da1333659a72e832dffbed182c.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>
Diffstat (limited to 'lttng/org.eclipse.linuxtools.tmf.core')
-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