Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Schwarz2015-01-30 00:49:06 -0500
committerTobias Schwarz2015-01-30 02:08:41 -0500
commit0b02250e8cc4f047dd8543a7034c1f088169867b (patch)
treed140353658ddff242f40f5d16e4320abf4310e9a
parentfa246c7c4340f9282e9ae6c6434322c04b0a8bd1 (diff)
downloadorg.eclipse.tcf-0b02250e8cc4f047dd8543a7034c1f088169867b.tar.gz
org.eclipse.tcf-0b02250e8cc4f047dd8543a7034c1f088169867b.tar.xz
org.eclipse.tcf-0b02250e8cc4f047dd8543a7034c1f088169867b.zip
SM: fix already running simulator is killed when not allowed to use it
on connect
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/utils/SimulatorUtils.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/utils/SimulatorUtils.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/utils/SimulatorUtils.java
index 7c31b3f15..d002acf6a 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/utils/SimulatorUtils.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/utils/SimulatorUtils.java
@@ -162,7 +162,7 @@ public final class SimulatorUtils {
result.service.useRunning(peerNode, result.settings, new Callback() {
@Override
protected void internalDone(Object caller, IStatus status) {
- setUsedRunningSimulator(peerNode, status.isOK());
+ setUsedRunningSimulator(peerNode, true);
callback.setResult(new Boolean(status.isOK()));
callback.done(caller, status);
}
@@ -213,6 +213,7 @@ public final class SimulatorUtils {
// Get the associated simulator service
final Result result = getSimulatorService(peerNode);
if (result != null && result.service != null && !getUsedRunningSimulator(peerNode)) {
+ setUsedRunningSimulator(peerNode, false);
// Determine if the simulator is at all running
result.service.isRunning(peerNode, result.settings, new Callback() {
@Override
@@ -233,6 +234,7 @@ public final class SimulatorUtils {
}
}, monitor);
} else {
+ setUsedRunningSimulator(peerNode, false);
callback.done(null, Status.OK_STATUS);
}
}

Back to the top