Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlvaro Sanchez-Leon2016-11-22 20:51:24 +0000
committerAlvaro Sanchez-Leon2016-11-28 00:02:54 +0000
commitebb8212e4a1f4829ac20cdb585f3a886892d930a (patch)
tree3de750ade2064679e152fbb0413ed7ac04fed626
parentcb14b447f82a5aea557008d2f63247ef638f8f8d (diff)
downloadorg.eclipse.cdt-ebb8212e4a1f4829ac20cdb585f3a886892d930a.tar.gz
org.eclipse.cdt-ebb8212e4a1f4829ac20cdb585f3a886892d930a.tar.xz
org.eclipse.cdt-ebb8212e4a1f4829ac20cdb585f3a886892d930a.zip
Bug 507950 - Deadlock when changing a variable value when reverseCDT_9_2_0
debugging with full gdb console Change-Id: I85618169e49a181a074417f132a4860cd9b7c026
-rw-r--r--dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/variable/SyncVariableDataAccess.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/variable/SyncVariableDataAccess.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/variable/SyncVariableDataAccess.java
index e323756192d..930a917e07f 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/variable/SyncVariableDataAccess.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/variable/SyncVariableDataAccess.java
@@ -11,6 +11,8 @@
package org.eclipse.cdt.dsf.debug.ui.viewmodel.variable;
import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
import org.eclipse.cdt.dsf.concurrent.DataRequestMonitor;
import org.eclipse.cdt.dsf.concurrent.IDsfStatusConstants;
@@ -268,13 +270,15 @@ public class SyncVariableDataAccess {
* Return value is irrelevant, any error would come through with an
* exception.
*/
- query.get();
+ query.get(3000, TimeUnit.MILLISECONDS);
} catch (InterruptedException e) {
assert false;
} catch (ExecutionException e) {
/*
* View must be shutting down, no need to show error dialog.
*/
+ } catch (TimeoutException e) {
+ assert false;
}
}

Back to the top