diff options
| author | Andrew Arnott <andrewarnott@gmail.com> | 2009-08-31 22:20:01 -0700 |
|---|---|---|
| committer | Andrew Arnott <andrewarnott@gmail.com> | 2009-08-31 22:20:01 -0700 |
| commit | 0488ebcfaef60e51bfcf7958b4a59d0ba5332a0f (patch) | |
| tree | a6681a912fab62ccf5e8e005ac382f6bcfb34a4b /samples/OAuthServiceProvider/App_Code/OAuthToken.cs | |
| parent | 0918f556a7da5f731b97cb4bbaa1ee5349c29d41 (diff) | |
| parent | 307ba2d4b5ad4574a52922b40027ea978e3d8a04 (diff) | |
| download | DotNetOpenAuth-0488ebcfaef60e51bfcf7958b4a59d0ba5332a0f.zip DotNetOpenAuth-0488ebcfaef60e51bfcf7958b4a59d0ba5332a0f.tar.gz DotNetOpenAuth-0488ebcfaef60e51bfcf7958b4a59d0ba5332a0f.tar.bz2 | |
Merge branch 'v3.0' into v3.1
Conflicts:
src/DotNetOpenAuth.vsmdi
src/DotNetOpenAuth/OpenId/OpenIdStrings.Designer.cs
src/DotNetOpenAuth/OpenId/OpenIdStrings.resx
Diffstat (limited to 'samples/OAuthServiceProvider/App_Code/OAuthToken.cs')
| -rw-r--r-- | samples/OAuthServiceProvider/App_Code/OAuthToken.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/samples/OAuthServiceProvider/App_Code/OAuthToken.cs b/samples/OAuthServiceProvider/App_Code/OAuthToken.cs index ec9b31e..2f26799 100644 --- a/samples/OAuthServiceProvider/App_Code/OAuthToken.cs +++ b/samples/OAuthServiceProvider/App_Code/OAuthToken.cs @@ -26,7 +26,7 @@ public partial class OAuthToken : IServiceProviderRequestToken { } Uri IServiceProviderRequestToken.Callback { - get { return new Uri(this.RequestTokenCallback); } + get { return string.IsNullOrEmpty(this.RequestTokenCallback) ? null : new Uri(this.RequestTokenCallback); } set { this.RequestTokenCallback = value.AbsoluteUri; } } |