Bug 573663 - Handle testCanReset exception while disconnecting a session
Change-Id: I35e4e26a1e1f65c52f75e53cefea1923dd2596d0
Signed-off-by: Deep Amin <deep.amin@intel.com>
diff --git a/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/launch/TCFPropertyTester.java b/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/launch/TCFPropertyTester.java
index 7adb5de..fe2ee64 100644
--- a/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/launch/TCFPropertyTester.java
+++ b/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/launch/TCFPropertyTester.java
@@ -68,18 +68,22 @@
while (!canReset && node != null) {
if (node instanceof TCFNodeExecContext) {
final TCFNodeExecContext exec = (TCFNodeExecContext)node;
- canReset = new TCFTask<Boolean>(exec.getChannel()) {
- @Override
- public void run() {
- TCFDataCache<Collection<Map<String, Object>>> cache = exec.getResetCapabilities();
- if (!cache.validate(this)) {
- return;
+ try {
+ canReset = new TCFTask<Boolean>(exec.getChannel()) {
+ @Override
+ public void run() {
+ TCFDataCache<Collection<Map<String, Object>>> cache = exec.getResetCapabilities();
+ if (!cache.validate(this)) {
+ return;
+ }
+ Collection<Map<String, Object>> caps = cache.getData();
+ boolean ok = caps != null && !caps.isEmpty();
+ done(ok);
}
- Collection<Map<String, Object>> caps = cache.getData();
- boolean ok = caps != null && !caps.isEmpty();
- done(ok);
- }
- }.getE();
+ }.getE();
+ } catch (Throwable x) {
+ Activator.log(x);
+ }
}
node = node.getParent();
}