From 0ff3b4ebde5e838580d4ab60546ca2b684e85bd8 Mon Sep 17 00:00:00 2001 From: Patrick Tasse Date: Tue, 24 Nov 2015 18:13:14 -0500 Subject: [PATCH] tmf: Fix unprocessed custom event content If the custom event content is read before the event timestamp, it could be undefined as the event data hasn't be processed yet. This can happen in test code. Change-Id: Idab415eb8015f1a7035bee11582d0baad89cad5b Signed-off-by: Patrick Tasse Reviewed-on: https://git.eclipse.org/r/61204 Reviewed-by: Hudson CI Reviewed-by: Marc-Andre Laperle Tested-by: Marc-Andre Laperle --- .../tracecompass/tmf/core/parsers/custom/CustomEvent.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/parsers/custom/CustomEvent.java b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/parsers/custom/CustomEvent.java index 9abb010208..e06481fcb7 100644 --- a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/parsers/custom/CustomEvent.java +++ b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/parsers/custom/CustomEvent.java @@ -137,6 +137,9 @@ public class CustomEvent extends TmfEvent { @Override public ITmfEventField getContent() { + if (fData != null) { + processData(); + } return customEventContent; } @@ -230,8 +233,7 @@ public class CustomEvent extends TmfEvent { fColumnData[i++] = new TmfEventField(outputColumn.name, (value != null ? value : ""), null); //$NON-NLS-1$ } } - CustomEventContent curContent = (CustomEventContent) getContent(); - setContent(new CustomEventContent(curContent.getName(), curContent.getValue(), fColumnData)); + setContent(new CustomEventContent(customEventContent.getName(), customEventContent.getValue(), fColumnData)); fData = null; } -- 2.34.1