diff options
author | Alvaro Sanchez-Leon | 2016-11-22 20:51:24 +0000 |
---|---|---|
committer | Alvaro Sanchez-Leon | 2017-01-24 19:40:58 +0000 |
commit | 3e770da279cba6c17e46c8d8fcec14b6cb64a49e (patch) | |
tree | 63b3c6aebec058b53cc3d5509f9be6a689c22fac /dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt | |
parent | 1d6cf481985826cf0f1a04b0c86ab59af173dc88 (diff) | |
download | org.eclipse.cdt-3e770da279cba6c17e46c8d8fcec14b6cb64a49e.tar.gz org.eclipse.cdt-3e770da279cba6c17e46c8d8fcec14b6cb64a49e.tar.xz org.eclipse.cdt-3e770da279cba6c17e46c8d8fcec14b6cb64a49e.zip |
Bug 507950 - Deadlock when changing a variable value when reverse
debugging with full gdb console
Change-Id: I85618169e49a181a074417f132a4860cd9b7c026
Diffstat (limited to 'dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt')
-rw-r--r-- | dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/variable/SyncVariableDataAccess.java | 6 |
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; } } |