diff options
author | Andrew Arnott <andrewarnott@gmail.com> | 2013-03-26 08:05:02 -0700 |
---|---|---|
committer | Andrew Arnott <andrewarnott@gmail.com> | 2013-03-26 08:05:02 -0700 |
commit | 1067ee7f15acea2a4f6cd588490a0384aee3011f (patch) | |
tree | b3ea6960006840f5859425cf2f6277a50cd55794 /src | |
parent | df6e154ad1cb197386cc96743eb930f010404c5c (diff) | |
download | DotNetOpenAuth-1067ee7f15acea2a4f6cd588490a0384aee3011f.zip DotNetOpenAuth-1067ee7f15acea2a4f6cd588490a0384aee3011f.tar.gz DotNetOpenAuth-1067ee7f15acea2a4f6cd588490a0384aee3011f.tar.bz2 |
Work toward fixing the serializable test failures
Diffstat (limited to 'src')
-rw-r--r-- | src/DotNetOpenAuth.OpenId.Provider/OpenId/Provider/HostProcessedRequest.cs | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/DotNetOpenAuth.OpenId.Provider/OpenId/Provider/HostProcessedRequest.cs b/src/DotNetOpenAuth.OpenId.Provider/OpenId/Provider/HostProcessedRequest.cs index 5f3bba2..6a4d6e6 100644 --- a/src/DotNetOpenAuth.OpenId.Provider/OpenId/Provider/HostProcessedRequest.cs +++ b/src/DotNetOpenAuth.OpenId.Provider/OpenId/Provider/HostProcessedRequest.cs @@ -31,8 +31,6 @@ namespace DotNetOpenAuth.OpenId.Provider { /// </summary> private RelyingPartyDiscoveryResult? realmDiscoveryResult; - private IHostFactories hostFactories; - /// <summary> /// Initializes a new instance of the <see cref="HostProcessedRequest"/> class. /// </summary> @@ -42,7 +40,6 @@ namespace DotNetOpenAuth.OpenId.Provider { : base(request, provider.SecuritySettings) { Requires.NotNull(provider, "provider"); - this.hostFactories = provider.Channel.HostFactories; this.negativeResponse = new Lazy<Task<NegativeAssertionResponse>>(() => NegativeAssertionResponse.CreateAsync(request, CancellationToken.None, provider.Channel)); Reporting.RecordEventOccurrence(this, request.Realm); } @@ -114,7 +111,8 @@ namespace DotNetOpenAuth.OpenId.Provider { /// property getter multiple times in one request is not a performance hit. /// See OpenID Authentication 2.0 spec section 9.2.1. /// </remarks> - public async Task<RelyingPartyDiscoveryResult> IsReturnUrlDiscoverableAsync(IHostFactories hostFactories, CancellationToken cancellationToken) { + public async Task<RelyingPartyDiscoveryResult> IsReturnUrlDiscoverableAsync(IHostFactories hostFactories, CancellationToken cancellationToken = default(CancellationToken)) { + Requires.NotNull(hostFactories, "hostFactories"); if (!this.realmDiscoveryResult.HasValue) { this.realmDiscoveryResult = await this.IsReturnUrlDiscoverableCoreAsync(hostFactories, cancellationToken); } @@ -142,8 +140,8 @@ namespace DotNetOpenAuth.OpenId.Provider { /// Result of realm discovery. /// </returns> private async Task<RelyingPartyDiscoveryResult> IsReturnUrlDiscoverableCoreAsync(IHostFactories hostFactories, CancellationToken cancellationToken) { + Requires.NotNull(hostFactories, "hostFactories"); ErrorUtilities.VerifyInternal(this.Realm != null, "Realm should have been read or derived by now."); - hostFactories = hostFactories ?? this.hostFactories; try { if (this.SecuritySettings.RequireSsl && this.Realm.Scheme != Uri.UriSchemeHttps) { |