From: Geneviève Bastien <gbastien+lttng@versatic.net>
Date: Tue, 7 Feb 2017 19:00:41 +0000 (-0500)
Subject: tmf.core: Move the analysis cancel log message
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=31386ddb7e99cf262855ea63c4028fc5da04ef7d;p=deliverable%2Ftracecompass.git

tmf.core: Move the analysis cancel log message

The analysis cancellation should be logged only if it was running
and is really cancelled. Otherwise, it produces confusing messages
where the analysis was previously finished and then cancelled.

Change-Id: I1704f2a29312b6c1a2a9b15e4869bcb646ab1204
Signed-off-by: Geneviève Bastien <gbastien+lttng@versatic.net>
Reviewed-on: https://git.eclipse.org/r/90577
Reviewed-by: Hudson CI
Reviewed-by: Matthew Khouzam <matthew.khouzam@ericsson.com>
Tested-by: Matthew Khouzam <matthew.khouzam@ericsson.com>
---

diff --git a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/analysis/TmfAbstractAnalysisModule.java b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/analysis/TmfAbstractAnalysisModule.java
index 8540fb35d1..23a3a720ec 100644
--- a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/analysis/TmfAbstractAnalysisModule.java
+++ b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/analysis/TmfAbstractAnalysisModule.java
@@ -269,9 +269,9 @@ public abstract class TmfAbstractAnalysisModule extends TmfComponent
     @Override
     public final void cancel() {
         synchronized (syncObj) {
-            TmfCoreTracer.traceAnalysis(getId(), getTrace(), "cancelled by application"); //$NON-NLS-1$
             Job job = fJob;
             if (job != null) {
+                TmfCoreTracer.traceAnalysis(getId(), getTrace(), "cancelled by application"); //$NON-NLS-1$
                 job.cancel();
                 fAnalysisCancelled = true;
                 setAnalysisCompleted();