summaryrefslogtreecommitdiffstats
path: root/src/DotNetOpenAuth.Core/Messaging/Channel.cs
diff options
context:
space:
mode:
authorAndrew Arnott <andrewarnott@gmail.com>2013-03-06 17:42:12 -0800
committerAndrew Arnott <andrewarnott@gmail.com>2013-03-06 17:42:12 -0800
commit5c50924246387b6d9a5ce668fb389b5ec7d93434 (patch)
treef86d6f629609450619e30533b1c0c4629111050b /src/DotNetOpenAuth.Core/Messaging/Channel.cs
parentab1e20ef732e482706cf5cea47e371f90476c8f3 (diff)
downloadDotNetOpenAuth-5c50924246387b6d9a5ce668fb389b5ec7d93434.zip
DotNetOpenAuth-5c50924246387b6d9a5ce668fb389b5ec7d93434.tar.gz
DotNetOpenAuth-5c50924246387b6d9a5ce668fb389b5ec7d93434.tar.bz2
Unit test build break fixes.
Diffstat (limited to 'src/DotNetOpenAuth.Core/Messaging/Channel.cs')
-rw-r--r--src/DotNetOpenAuth.Core/Messaging/Channel.cs15
1 files changed, 9 insertions, 6 deletions
diff --git a/src/DotNetOpenAuth.Core/Messaging/Channel.cs b/src/DotNetOpenAuth.Core/Messaging/Channel.cs
index 8564e38..62de162 100644
--- a/src/DotNetOpenAuth.Core/Messaging/Channel.cs
+++ b/src/DotNetOpenAuth.Core/Messaging/Channel.cs
@@ -504,8 +504,8 @@ namespace DotNetOpenAuth.Messaging {
/// <param name="response">The response that is anticipated to contain an protocol message.</param>
/// <returns>The deserialized message parts, if found. Null otherwise.</returns>
/// <exception cref="ProtocolException">Thrown when the response is not valid.</exception>
- internal Task<IDictionary<string, string>> ReadFromResponseCoreAsyncTestHook(HttpResponseMessage response) {
- return this.ReadFromResponseCoreAsync(response);
+ internal Task<IDictionary<string, string>> ReadFromResponseCoreAsyncTestHook(HttpResponseMessage response, CancellationToken cancellationToken) {
+ return this.ReadFromResponseCoreAsync(response, cancellationToken);
}
/// <summary>
@@ -520,7 +520,7 @@ namespace DotNetOpenAuth.Messaging {
/// This method should NOT be called by derived types
/// except when sending ONE WAY request messages.
/// </remarks>
- internal Task ProcessOutgoingMessageTestHookAsync(IProtocolMessage message, CancellationToken cancellationToken) {
+ internal Task ProcessOutgoingMessageTestHookAsync(IProtocolMessage message, CancellationToken cancellationToken = default(CancellationToken)) {
return this.ProcessOutgoingMessageAsync(message, cancellationToken);
}
@@ -685,7 +685,7 @@ namespace DotNetOpenAuth.Messaging {
return null;
}
- var responseFields = await this.ReadFromResponseCoreAsync(response);
+ var responseFields = await this.ReadFromResponseCoreAsync(response, cancellationToken);
if (responseFields == null) {
return null;
}
@@ -914,9 +914,12 @@ namespace DotNetOpenAuth.Messaging {
/// Gets the protocol message that may be in the given HTTP response.
/// </summary>
/// <param name="response">The response that is anticipated to contain an protocol message.</param>
- /// <returns>The deserialized message parts, if found. Null otherwise.</returns>
+ /// <param name="cancellationToken">The cancellation token.</param>
+ /// <returns>
+ /// The deserialized message parts, if found. Null otherwise.
+ /// </returns>
/// <exception cref="ProtocolException">Thrown when the response is not valid.</exception>
- protected abstract Task<IDictionary<string, string>> ReadFromResponseCoreAsync(HttpResponseMessage response);
+ protected abstract Task<IDictionary<string, string>> ReadFromResponseCoreAsync(HttpResponseMessage response, CancellationToken cancellationToken);
/// <summary>
/// Prepares an HTTP request that carries a given message.