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 <patrick.tasse@gmail.com>
Reviewed-on: https://git.eclipse.org/r/61204
Reviewed-by: Hudson CI
Reviewed-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
Tested-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>

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 9abb0102089496e53f824e9d76cad5fb4b39e308..e06481fcb791b203fc2f40e7bc1d22e962772510 100644 (file)
--- 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;
     }