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

Missing ChangeToken -> GetChangeToken updates (#660)

This commit is contained in:
James Newton-King 2018-07-25 14:35:41 +12:00 committed by GitHub
parent 147c9527f3
commit fdff66054f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Microsoft.AspNetCore.Routing/CompositeEndpointDataSource.cs
View File

@ -34,13 +34,12 @@ namespace Microsoft.AspNetCore.Routing
_lock = new object(); _lock = new object();
} }
public override IChangeToken ChangeToken public override IChangeToken ChangeToken => GetChangeToken();
public override IChangeToken GetChangeToken()
{ {
get EnsureInitialized();
{ return _consumerChangeToken;
EnsureInitialized();
return _consumerChangeToken;
}
} }
public override IReadOnlyList<Endpoint> Endpoints public override IReadOnlyList<Endpoint> Endpoints

4
src/Microsoft.AspNetCore.Routing/DefaultEndpointDataSource.cs
View File

@ -23,7 +23,9 @@ namespace Microsoft.AspNetCore.Routing
_endpoints.AddRange(endpoints); _endpoints.AddRange(endpoints);
} }
public override IChangeToken ChangeToken { get; } = NullChangeToken.Singleton; public override IChangeToken ChangeToken => GetChangeToken();
public override IChangeToken GetChangeToken() => NullChangeToken.Singleton;
public override IReadOnlyList<Endpoint> Endpoints => _endpoints; public override IReadOnlyList<Endpoint> Endpoints => _endpoints;
} }

3
test/Microsoft.AspNetCore.Routing.Tests/CompositeEndpointDataSourceTest.cs
View File

@ -173,7 +173,8 @@ namespace Microsoft.AspNetCore.Routing
_token = new CancellationChangeToken(_cts.Token); _token = new CancellationChangeToken(_cts.Token);
} }
public override IChangeToken ChangeToken => _token; public override IChangeToken GetChangeToken() => _token;
public override IChangeToken ChangeToken => GetChangeToken();
public override IReadOnlyList<Endpoint> Endpoints => Array.Empty<Endpoint>(); public override IReadOnlyList<Endpoint> Endpoints => Array.Empty<Endpoint>();
} }
} }

4
test/Microsoft.AspNetCore.Routing.Tests/TestObjects/DynamicEndpointDataSource.cs
View File

@ -23,7 +23,9 @@ namespace Microsoft.AspNetCore.Routing.TestObjects
CreateChangeToken(); CreateChangeToken();
} }
public override IChangeToken ChangeToken => _changeToken; public override IChangeToken GetChangeToken() => _changeToken;
public override IChangeToken ChangeToken => GetChangeToken();
public override IReadOnlyList<Endpoint> Endpoints => _endpoints; public override IReadOnlyList<Endpoint> Endpoints => _endpoints;