summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Arnott <andrewarnott@gmail.com>2009-06-14 21:24:09 -0700
committerAndrew Arnott <andrewarnott@gmail.com>2009-06-15 14:28:18 -0700
commit7a2cf9340563c66b8882f533bd2199fefc0f0db1 (patch)
tree16634fe15cadc89b2cda8cb5870f8b667d875132
parent7294f37424e65de310f45839110088a3a8e47b71 (diff)
downloadDotNetOpenAuth-7a2cf9340563c66b8882f533bd2199fefc0f0db1.zip
DotNetOpenAuth-7a2cf9340563c66b8882f533bd2199fefc0f0db1.tar.gz
DotNetOpenAuth-7a2cf9340563c66b8882f533bd2199fefc0f0db1.tar.bz2
ErrorUtilities.ThrowInternal now returns an exception type for easier C# validation.
-rw-r--r--src/DotNetOpenAuth/Messaging/ErrorUtilities.cs21
-rw-r--r--src/DotNetOpenAuth/OpenId/Provider/ProviderEndpoint.cs2
2 files changed, 12 insertions, 11 deletions
diff --git a/src/DotNetOpenAuth/Messaging/ErrorUtilities.cs b/src/DotNetOpenAuth/Messaging/ErrorUtilities.cs
index 59bd4dd..d81ce17 100644
--- a/src/DotNetOpenAuth/Messaging/ErrorUtilities.cs
+++ b/src/DotNetOpenAuth/Messaging/ErrorUtilities.cs
@@ -35,10 +35,18 @@ namespace DotNetOpenAuth.Messaging {
/// Throws an internal error exception.
/// </summary>
/// <param name="errorMessage">The error message.</param>
+ /// <returns>Nothing. But included here so callers can "throw" this method for C# safety.</returns>
/// <exception cref="InternalErrorException">Always thrown.</exception>
[Pure]
- internal static void ThrowInternal(string errorMessage) {
- VerifyInternal(false, errorMessage);
+ internal static Exception ThrowInternal(string errorMessage) {
+ // Since internal errors are really bad, take this chance to
+ // help the developer find the cause by breaking into the
+ // debugger if one is attached.
+ if (Debugger.IsAttached) {
+ Debugger.Break();
+ }
+
+ throw new InternalErrorException(errorMessage);
}
/// <summary>
@@ -52,14 +60,7 @@ namespace DotNetOpenAuth.Messaging {
Contract.Ensures(condition);
Contract.EnsuresOnThrow<InternalErrorException>(!condition);
if (!condition) {
- // Since internal errors are really bad, take this chance to
- // help the developer find the cause by breaking into the
- // debugger if one is attached.
- if (Debugger.IsAttached) {
- Debugger.Break();
- }
-
- throw new InternalErrorException(errorMessage);
+ ThrowInternal(errorMessage);
}
}
diff --git a/src/DotNetOpenAuth/OpenId/Provider/ProviderEndpoint.cs b/src/DotNetOpenAuth/OpenId/Provider/ProviderEndpoint.cs
index 37da8a3..635a3c0 100644
--- a/src/DotNetOpenAuth/OpenId/Provider/ProviderEndpoint.cs
+++ b/src/DotNetOpenAuth/OpenId/Provider/ProviderEndpoint.cs
@@ -102,7 +102,7 @@ namespace DotNetOpenAuth.OpenId.Provider {
public static void SendResponse() {
var pendingRequest = PendingAuthenticationRequest;
PendingAuthenticationRequest = null;
- Provider.SendResponse(pendingRequest);
+ Provider.SendResponse(pendingRequest);
}
/// <summary>