Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUwe Stieber2013-04-12 09:13:25 -0400
committerUwe Stieber2013-04-12 09:13:25 -0400
commit80389121ae3c37545dd5e4c5d0cc87ddf030b3bb (patch)
treef112d86848aacafacdf3ba0de23aeecdb27b4b5f /target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf
parentccf1b162686a47401aee384afb648b699c030cc3 (diff)
downloadorg.eclipse.tcf-80389121ae3c37545dd5e4c5d0cc87ddf030b3bb.tar.gz
org.eclipse.tcf-80389121ae3c37545dd5e4c5d0cc87ddf030b3bb.tar.xz
org.eclipse.tcf-80389121ae3c37545dd5e4c5d0cc87ddf030b3bb.zip
Target Explorer: Fix a set of shutdown issues
Diffstat (limited to 'target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf')
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/activator/UIPlugin.java12
1 files changed, 10 insertions, 2 deletions
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/activator/UIPlugin.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/activator/UIPlugin.java
index e6cf6924d..61f27ee0d 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/activator/UIPlugin.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/activator/UIPlugin.java
@@ -18,6 +18,8 @@ import org.eclipse.jface.resource.ImageRegistry;
import org.eclipse.swt.graphics.Image;
import org.eclipse.tcf.protocol.Protocol;
import org.eclipse.tcf.te.tcf.core.Tcf;
+import org.eclipse.tcf.te.tcf.locator.interfaces.nodes.ILocatorModel;
+import org.eclipse.tcf.te.tcf.locator.model.Model;
import org.eclipse.tcf.te.tcf.ui.internal.ImageConsts;
import org.eclipse.tcf.te.ui.jface.images.AbstractImageDescriptor;
import org.eclipse.ui.IWorkbench;
@@ -87,8 +89,14 @@ public class UIPlugin extends AbstractUIPlugin {
if (!proceedShutdown && !forced) break;
}
- // Close all channels now
- if (proceedShutdown || forced) Tcf.getChannelManager().closeAll(!Protocol.isDispatchThread());
+ if (proceedShutdown || forced) {
+ // Terminate the scanner
+ ILocatorModel model = Model.getModel(true);
+ if (model != null) model.getScanner().terminate();
+
+ // Close all channels now
+ Tcf.getChannelManager().closeAll(!Protocol.isDispatchThread());
+ }
return proceedShutdown;
}

Back to the top