Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoreutarass2010-06-03 15:20:55 -0400
committereutarass2010-06-03 15:20:55 -0400
commite7c5439580bf4772ebd8eaf1ea35e6fa3a9279dc (patch)
treea2922d9d3dee4fc9608612f6060b7d0448fec66a
parentc42eb1b81469cf3538ad9206ccc34eae2813e6c8 (diff)
downloadorg.eclipse.tcf-e7c5439580bf4772ebd8eaf1ea35e6fa3a9279dc.tar.gz
org.eclipse.tcf-e7c5439580bf4772ebd8eaf1ea35e6fa3a9279dc.tar.xz
org.eclipse.tcf-e7c5439580bf4772ebd8eaf1ea35e6fa3a9279dc.zip
TCF Debugger: workaround for deadlock in AbstractModelProxy.fireModelChanged() in Eclipse 3.6.0 Helios
-rw-r--r--plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFModelProxy.java12
1 files changed, 10 insertions, 2 deletions
diff --git a/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFModelProxy.java b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFModelProxy.java
index ae36293f6..e18391c51 100644
--- a/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFModelProxy.java
+++ b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFModelProxy.java
@@ -266,6 +266,14 @@ public class TCFModelProxy extends AbstractModelProxy implements IModelProxy, Ru
return delta;
}
+ private void postDelta(final ModelDelta root) {
+ model.getDisplay().asyncExec(new Runnable() {
+ public void run() {
+ fireModelChanged(root);
+ }
+ });
+ }
+
public void run() {
assert Protocol.isDispatchThread();
if (disposed) return;
@@ -281,7 +289,7 @@ public class TCFModelProxy extends AbstractModelProxy implements IModelProxy, Ru
if (pending_node == null) {
node2flags.clear();
if ((root.getFlags() != 0 || node2delta.size() > 0) && (root.getFlags() & IModelDelta.REMOVED) == 0) {
- fireModelChanged(root);
+ postDelta(root);
}
node2delta.clear();
last_update_time = System.currentTimeMillis();
@@ -290,7 +298,7 @@ public class TCFModelProxy extends AbstractModelProxy implements IModelProxy, Ru
makeDelta(root, selection, IModelDelta.SELECT | IModelDelta.EXPAND, true);
node2delta.clear();
if (pending_node == null) {
- fireModelChanged(root);
+ postDelta(root);
selection = null;
}
}

Back to the top