diff options
| author | Andrew Arnott <andrewarnott@gmail.com> | 2009-09-01 17:34:59 -0700 |
|---|---|---|
| committer | Andrew Arnott <andrewarnott@gmail.com> | 2009-09-01 17:34:59 -0700 |
| commit | 6e8a6eb02294c28b13bacaa339e58a67fd766f99 (patch) | |
| tree | a1bd58a2a51505ba71b697fb61378e7142df8ef3 /samples/OAuthServiceProvider/App_Code/OAuthConsumer.cs | |
| parent | e36299f39476c56977c39700067ed8f6ae0a4e49 (diff) | |
| parent | 36b1ba3c75d060fa71f6f15582b90e7f70292ddc (diff) | |
| download | DotNetOpenAuth-6e8a6eb02294c28b13bacaa339e58a67fd766f99.zip DotNetOpenAuth-6e8a6eb02294c28b13bacaa339e58a67fd766f99.tar.gz DotNetOpenAuth-6e8a6eb02294c28b13bacaa339e58a67fd766f99.tar.bz2 | |
Merge branch 'master' into contracts
Conflicts:
src/DotNetOpenAuth.Test/Mocks/MockIdentifier.cs
src/DotNetOpenAuth.Test/OpenId/Provider/OpenIdProviderTests.cs
src/DotNetOpenAuth.vsmdi
src/DotNetOpenAuth/DotNetOpenAuth.csproj
src/DotNetOpenAuth/Messaging/MessageReceivingEndpoint.cs
src/DotNetOpenAuth/OAuth/ChannelElements/OAuthServiceProviderMessageFactory.cs
src/DotNetOpenAuth/OAuth/Protocol.cs
src/DotNetOpenAuth/OAuth/ServiceProvider.cs
src/DotNetOpenAuth/OpenId/Association.cs
src/DotNetOpenAuth/OpenId/Behaviors/PpidGeneration.cs
src/DotNetOpenAuth/OpenId/NoDiscoveryIdentifier.cs
src/DotNetOpenAuth/OpenId/Provider/HostProcessedRequest.cs
src/DotNetOpenAuth/OpenId/Provider/IDirectedIdentityIdentifierProvider.cs
src/DotNetOpenAuth/OpenId/Provider/PrivatePersonalIdentifierProviderBase.cs
src/DotNetOpenAuth/OpenId/Realm.cs
src/DotNetOpenAuth/OpenId/RelyingParty/AuthenticationRequest.cs
src/DotNetOpenAuth/OpenId/RelyingParty/OpenIdAjaxTextBox.cs
src/DotNetOpenAuth/OpenId/RelyingParty/OpenIdRelyingPartyAjaxControlBase.cs
src/DotNetOpenAuth/OpenId/RelyingParty/OpenIdTextBox.cs
src/DotNetOpenAuth/OpenId/RelyingParty/PositiveAuthenticationResponseSnapshot.cs
src/DotNetOpenAuth/OpenId/UriIdentifier.cs
src/DotNetOpenAuth/OpenId/XriIdentifier.cs
src/DotNetOpenAuth/Util.cs
Diffstat (limited to 'samples/OAuthServiceProvider/App_Code/OAuthConsumer.cs')
| -rw-r--r-- | samples/OAuthServiceProvider/App_Code/OAuthConsumer.cs | 2 |
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 { |