Skip to content
This repository has been archived by the owner on Jan 24, 2021. It is now read-only.

Fix a memory leak #2605

Open
wants to merge 1 commit into
base: 1.x-WorkingBranch
Choose a base branch
from
Open

Fix a memory leak #2605

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 3 additions & 5 deletions src/Nancy/NancyEngine.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,8 @@ public class NancyEngine : INancyEngine

public Task<NancyContext> HandleRequest(Request request, Func<NancyContext, NancyContext> preRequest, CancellationToken cancellationToken)
{
var cts = CancellationTokenSource.CreateLinkedTokenSource(this.engineDisposedCts.Token, cancellationToken);
using(var cts = CancellationTokenSource.CreateLinkedTokenSource(this.engineDisposedCts.Token, cancellationToken))
{
cts.Token.ThrowIfCancellationRequested();

var tcs = new TaskCompletionSource<NancyContext>();
Expand Down Expand Up @@ -138,10 +139,6 @@ public Task<NancyContext> HandleRequest(Request request, Func<NancyContext, Nanc
tcs.SetException(ex);
return;
}
finally
{
cts.Dispose();
}

tcs.SetResult(completeTask.Result);
},
Expand All @@ -152,6 +149,7 @@ public Task<NancyContext> HandleRequest(Request request, Func<NancyContext, Nanc
true);

return tcs.Task;
}
}

/// <summary>
Expand Down