tmf: fix concurrency issue in analyses modules (bug 447434)

[deliverable/tracecompass.git] / org.eclipse.tracecompass.tmf.pcap.core / src / org / eclipse / tracecompass / internal / tmf / pcap / core / analysis / StreamListAnalysis.java

diff --git a/org.eclipse.tracecompass.tmf.pcap.core/src/org/eclipse/tracecompass/internal/tmf/pcap/core/analysis/StreamListAnalysis.java b/org.eclipse.tracecompass.tmf.pcap.core/src/org/eclipse/tracecompass/internal/tmf/pcap/core/analysis/StreamListAnalysis.java
index a1ba93ee4d6cb1d39dccd7c17e11ee2f09064aa7..a0c3fa7c360b399fbed059813df1a5668a16d8b9 100644 (file)
--- a/org.eclipse.tracecompass.tmf.pcap.core/src/org/eclipse/tracecompass/internal/tmf/pcap/core/analysis/StreamListAnalysis.java
+++ b/org.eclipse.tracecompass.tmf.pcap.core/src/org/eclipse/tracecompass/internal/tmf/pcap/core/analysis/StreamListAnalysis.java
@@ -88,7 +88,9 @@ public class StreamListAnalysis extends TmfAbstractAnalysisModule {
     @Override
     protected boolean executeAnalysis(@Nullable IProgressMonitor monitor) throws TmfAnalysisException {
         IProgressMonitor mon = (monitor == null ? new NullProgressMonitor() : monitor);
-        if (getTrace() == null) {
+        ITmfTrace trace = getTrace();
+        if (trace == null) {
+            /* This analysis was cancelled in the meantime */
             return false;
         }
 
@@ -115,7 +117,7 @@ public class StreamListAnalysis extends TmfAbstractAnalysisModule {
 
             }
         };
-        getTrace().sendRequest(request);
+        trace.sendRequest(request);
         fRequest = request;
         try {
             request.waitForCompletion();