summaryrefslogtreecommitdiffstats
path: root/samples/OAuthServiceProvider/App_Code/OAuthConsumer.cs
diff options
context:
space:
mode:
authorAndrew Arnott <andrewarnott@gmail.com>2009-08-31 22:36:07 -0700
committerAndrew Arnott <andrewarnott@gmail.com>2009-08-31 22:36:07 -0700
commit36b1ba3c75d060fa71f6f15582b90e7f70292ddc (patch)
treedfd32367b587453369a4d58e75482d1a9ca23556 /samples/OAuthServiceProvider/App_Code/OAuthConsumer.cs
parent5ad3b4e1fdc50cbcebfde7fd0f5cd0ef629d874a (diff)
parent22cd5b99d428271139aa0005d5b3462979cc2720 (diff)
downloadDotNetOpenAuth-36b1ba3c75d060fa71f6f15582b90e7f70292ddc.zip
DotNetOpenAuth-36b1ba3c75d060fa71f6f15582b90e7f70292ddc.tar.gz
DotNetOpenAuth-36b1ba3c75d060fa71f6f15582b90e7f70292ddc.tar.bz2
Merge branch 'v3.2'
Conflicts: src/DotNetOpenAuth.vsmdi src/DotNetOpenAuth/OpenId/Identifier.cs
Diffstat (limited to 'samples/OAuthServiceProvider/App_Code/OAuthConsumer.cs')
-rw-r--r--samples/OAuthServiceProvider/App_Code/OAuthConsumer.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/samples/OAuthServiceProvider/App_Code/OAuthConsumer.cs b/samples/OAuthServiceProvider/App_Code/OAuthConsumer.cs
index 1255717..db8f469 100644
--- a/samples/OAuthServiceProvider/App_Code/OAuthConsumer.cs
+++ b/samples/OAuthServiceProvider/App_Code/OAuthConsumer.cs
@@ -26,7 +26,7 @@ public partial class OAuthConsumer : IConsumerDescription {
}
Uri IConsumerDescription.Callback {
- get { return this.Callback != null ? new Uri(this.Callback) : null; }
+ get { return string.IsNullOrEmpty(this.Callback) ? null : new Uri(this.Callback); }
}
DotNetOpenAuth.OAuth.VerificationCodeFormat IConsumerDescription.VerificationCodeFormat {