From: Marc-Andre Laperle Date: Wed, 6 May 2015 21:28:36 +0000 (-0400) Subject: tmf: Fix regression of XML analysis combined with custom text parser not working X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=bcd97f27068c99f52490e5d8cd033b63e98016d1;p=deliverable%2Ftracecompass.git tmf: Fix regression of XML analysis combined with custom text parser not working bug: 466641 Change-Id: I9c6ea6014e6f25f73e52ed182b6abc2ab2394a17 Signed-off-by: Marc-Andre Laperle Reviewed-on: https://git.eclipse.org/r/47382 Reviewed-by: Hudson CI Reviewed-by: Matthew Khouzam Tested-by: Matthew Khouzam --- diff --git a/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/event/TmfEvent.java b/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/event/TmfEvent.java index b4f85b0c61..88e07dd45d 100644 --- a/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/event/TmfEvent.java +++ b/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/event/TmfEvent.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2014 Ericsson + * Copyright (c) 2009, 2015 Ericsson * * All rights reserved. This program and the accompanying materials are made * available under the terms of the Eclipse Public License v1.0 which @@ -141,7 +141,7 @@ public class TmfEvent extends PlatformObject implements ITmfEvent { */ @Override public String getName() { - ITmfEventType type = fType; + ITmfEventType type = getType(); if (type != null) { return type.getName(); }