ckaczor/sqltoolsservice
1
0
Fork 0
mirror of https://github.com/ckaczor/sqltoolsservice.git synced 2026-02-16 18:47:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix nullref in object timeout

Browse Source
This commit is contained in:
Karl Burtram
2017-05-29 00:00:32 -07:00
parent 8e7fac26e5
commit 5f4ab5eba8
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/ObjectExplorerService.cs
View File

@@ -275,7 +275,9 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer
CreateSessionTask = task; CreateSessionTask = task;
Task.Run(async () => Task.Run(async () =>
{ {
ObjectExplorerTaskResult result = await RunTaskWithTimeout(task, settings.CreateSessionTimeout); ObjectExplorerTaskResult result = await RunTaskWithTimeout(task,
settings?.CreateSessionTimeout ?? ObjectExplorerSettings.DefaultCreateSessionTimeout);
if (result != null && !result.IsComplete) if (result != null && !result.IsComplete)
{ {
cancellationTokenSource.Cancel(); cancellationTokenSource.Cancel();
@@ -419,7 +421,9 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer
ExpandTask = task; ExpandTask = task;
Task.Run(async () => Task.Run(async () =>
{ {
ObjectExplorerTaskResult result = await RunTaskWithTimeout(task, settings.ExpandTimeout); ObjectExplorerTaskResult result = await RunTaskWithTimeout(task,
settings?.ExpandTimeout ?? ObjectExplorerSettings.DefaultExpandTimeout);
if (result != null && !result.IsComplete) if (result != null && !result.IsComplete)
{ {
cancellationTokenSource.Cancel(); cancellationTokenSource.Cancel();

7
src/Microsoft.SqlTools.ServiceLayer/SqlContext/ObjectExplorerSettings.cs
View File

@@ -10,10 +10,13 @@ namespace Microsoft.SqlTools.ServiceLayer.SqlContext
/// </summary> /// </summary>
public class ObjectExplorerSettings public class ObjectExplorerSettings
{ {
public static int DefaultCreateSessionTimeout = 10;
public static int DefaultExpandTimeout = 10;
public ObjectExplorerSettings() public ObjectExplorerSettings()
{ {
CreateSessionTimeout = 10; CreateSessionTimeout = DefaultCreateSessionTimeout;
ExpandTimeout = 10; ExpandTimeout = DefaultExpandTimeout;
} }
/// <summary> /// <summary>