Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Tasse2012-07-13 13:17:16 -0400
committerGerrit Code Review @ Eclipse.org2012-07-13 13:17:16 -0400
commitaa2387e4875f6c34501968fa5f44391c124298de (patch)
tree634284b500e406d241eee97a76044d6019d8d6fc
parent302b681beffd30733e522c8d742302866e28fcec (diff)
parente21c44b00db0f21862de7219ccbb6a71cc89b0b3 (diff)
downloadorg.eclipse.linuxtools-aa2387e4875f6c34501968fa5f44391c124298de.tar.gz
org.eclipse.linuxtools-aa2387e4875f6c34501968fa5f44391c124298de.tar.xz
org.eclipse.linuxtools-aa2387e4875f6c34501968fa5f44391c124298de.zip
Merge "tmf: Do not broadcast signal if request is cancelled"
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/statesystem/HistoryBuilder.java11
1 files changed, 7 insertions, 4 deletions
diff --git a/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/statesystem/HistoryBuilder.java b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/statesystem/HistoryBuilder.java
index b819e3cb48..da2e4e2d48 100644
--- a/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/statesystem/HistoryBuilder.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/statesystem/HistoryBuilder.java
@@ -183,15 +183,18 @@ public class HistoryBuilder extends TmfComponent {
}
void close(boolean deleteFiles) {
+ TmfSignal doneSig;
+
sci.dispose();
if (deleteFiles) {
hb.removeFiles();
+ /* We won't broadcast the signal if the request was cancelled */
+ } else {
+ /* Broadcast the signal saying the history is done building */
+ doneSig = new TmfStateSystemBuildCompleted(this, sci.getTrace());
+ TmfSignalManager.dispatchSignal(doneSig);
}
- /* Broadcast the signal saying the history is done building */
- TmfSignal doneSig = new TmfStateSystemBuildCompleted(this, sci.getTrace());
- TmfSignalManager.dispatchSignal(doneSig);
-
TmfSignalManager.deregister(this);
}
}

Back to the top