huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove usage of TaskCache

This commit is contained in:
Pranav K 2017-06-08 08:48:37 -07:00
parent 1ffa0c8aec
commit a23f1601fd
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Microsoft.AspNetCore.Routing/Microsoft.AspNetCore.Routing.csproj
View File

@ -27,6 +27,5 @@ Microsoft.AspNetCore.Routing.RouteCollection</Description>
<PackageReference Include="Microsoft.Extensions.ObjectPool" Version="$(AspNetCoreVersion)" /> <PackageReference Include="Microsoft.Extensions.ObjectPool" Version="$(AspNetCoreVersion)" />
<PackageReference Include="Microsoft.Extensions.Options" Version="$(AspNetCoreVersion)" /> <PackageReference Include="Microsoft.Extensions.Options" Version="$(AspNetCoreVersion)" />
<PackageReference Include="Microsoft.Extensions.PropertyHelper.Sources" Version="$(AspNetCoreVersion)" PrivateAssets="All" /> <PackageReference Include="Microsoft.Extensions.PropertyHelper.Sources" Version="$(AspNetCoreVersion)" PrivateAssets="All" />
<PackageReference Include="Microsoft.Extensions.TaskCache.Sources" Version="$(AspNetCoreVersion)" PrivateAssets="All" />
</ItemGroup> </ItemGroup>
</Project> </Project>

5
src/Microsoft.AspNetCore.Routing/RouteBase.cs
View File

@ -10,7 +10,6 @@ using Microsoft.AspNetCore.Routing.Internal;
using Microsoft.AspNetCore.Routing.Logging; using Microsoft.AspNetCore.Routing.Logging;
using Microsoft.AspNetCore.Routing.Template; using Microsoft.AspNetCore.Routing.Template;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Internal;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Microsoft.Extensions.ObjectPool; using Microsoft.Extensions.ObjectPool;
@ -88,7 +87,7 @@ namespace Microsoft.AspNetCore.Routing
if (!_matcher.TryMatch(requestPath, context.RouteData.Values)) if (!_matcher.TryMatch(requestPath, context.RouteData.Values))
{ {
// If we got back a null value set, that means the URI did not match // If we got back a null value set, that means the URI did not match
return TaskCache.CompletedTask; return Task.CompletedTask;
} }
// Perf: Avoid accessing dictionaries if you don't need to write to them, these dictionaries are all // Perf: Avoid accessing dictionaries if you don't need to write to them, these dictionaries are all
@ -106,7 +105,7 @@ namespace Microsoft.AspNetCore.Routing
RouteDirection.IncomingRequest, RouteDirection.IncomingRequest,
_constraintLogger)) _constraintLogger))
{ {
return TaskCache.CompletedTask; return Task.CompletedTask;
} }
_logger.MatchedRoute(Name, ParsedTemplate.TemplateText); _logger.MatchedRoute(Name, ParsedTemplate.TemplateText);

3
src/Microsoft.AspNetCore.Routing/RouteHandler.cs
View File

@ -3,7 +3,6 @@
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.Internal;
namespace Microsoft.AspNetCore.Routing namespace Microsoft.AspNetCore.Routing
{ {
@ -30,7 +29,7 @@ namespace Microsoft.AspNetCore.Routing
public Task RouteAsync(RouteContext context) public Task RouteAsync(RouteContext context)
{ {
context.Handler = _requestDelegate; context.Handler = _requestDelegate;
return TaskCache.CompletedTask; return Task.CompletedTask;
} }
} }
} }