From eaa28c512be675c79eb8bf8da662978f8253b0c1 Mon Sep 17 00:00:00 2001 From: Sara Itani Date: Tue, 15 Sep 2015 00:35:57 -0700 Subject: [PATCH] - cleaned up code - added timeout to backtraceCommand --- Nodejs/Product/Nodejs/Debugger/DebugEngine/AD7Engine.cs | 1 - Nodejs/Product/Nodejs/Debugger/NodeDebugger.cs | 5 +++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Nodejs/Product/Nodejs/Debugger/DebugEngine/AD7Engine.cs b/Nodejs/Product/Nodejs/Debugger/DebugEngine/AD7Engine.cs index 6457d3a87..e50f70adb 100644 --- a/Nodejs/Product/Nodejs/Debugger/DebugEngine/AD7Engine.cs +++ b/Nodejs/Product/Nodejs/Debugger/DebugEngine/AD7Engine.cs @@ -1149,7 +1149,6 @@ private void OnModuleLoaded(object sender, ModuleLoadedEventArgs e) { if (_loadComplete) { SendModuleLoad(adModule); } - } } diff --git a/Nodejs/Product/Nodejs/Debugger/NodeDebugger.cs b/Nodejs/Product/Nodejs/Debugger/NodeDebugger.cs index 8839bb6fa..8b404ccda 100644 --- a/Nodejs/Product/Nodejs/Debugger/NodeDebugger.cs +++ b/Nodejs/Product/Nodejs/Debugger/NodeDebugger.cs @@ -246,8 +246,9 @@ public async Task BreakAllAsync() { } internal bool IsRunning() { - var backtraceCommand = new BacktraceCommand(CommandId, _resultFactory, 0, 1); - if (TrySendRequestAsync(backtraceCommand).GetAwaiter().GetResult()) { + var backtraceCommand = new BacktraceCommand(CommandId, _resultFactory, fromFrame: 0, toFrame: 1); + var tokenSource = new CancellationTokenSource(_timeout); + if (TrySendRequestAsync(backtraceCommand, tokenSource.Token).GetAwaiter().GetResult()) { return backtraceCommand.Running; } return false;