diff options
| author | Andrew Arnott <andrewarnott@gmail.com> | 2008-04-17 21:00:46 -0700 |
|---|---|---|
| committer | Andrew Arnott <andrewarnott@gmail.com> | 2008-04-17 21:00:46 -0700 |
| commit | 07b8b586c6873b88df126b4bd9947d87afe8f929 (patch) | |
| tree | ad2afc31571c5be07c705700688ee1ce9b420a89 /src | |
| parent | f430f0ffa338319a03c77c2d6f7157529ed5effd (diff) | |
| download | DotNetOpenAuth-07b8b586c6873b88df126b4bd9947d87afe8f929.zip DotNetOpenAuth-07b8b586c6873b88df126b4bd9947d87afe8f929.tar.gz DotNetOpenAuth-07b8b586c6873b88df126b4bd9947d87afe8f929.tar.bz2 | |
Fixed bugs in simple registration extension introduced in recent change from struct to class.
Diffstat (limited to 'src')
| -rw-r--r-- | src/DotNetOpenId/Extensions/SimpleRegistrationFieldValues.cs | 4 | ||||
| -rw-r--r-- | src/DotNetOpenId/Extensions/SimpleRegistrationRequestFields.cs | 9 |
2 files changed, 8 insertions, 5 deletions
diff --git a/src/DotNetOpenId/Extensions/SimpleRegistrationFieldValues.cs b/src/DotNetOpenId/Extensions/SimpleRegistrationFieldValues.cs index e6fbe21..b86c118 100644 --- a/src/DotNetOpenId/Extensions/SimpleRegistrationFieldValues.cs +++ b/src/DotNetOpenId/Extensions/SimpleRegistrationFieldValues.cs @@ -198,13 +198,15 @@ namespace DotNetOpenId.Extensions /// Tests equality of two <see cref="SimpleRegistrationFieldValues"/> objects.
/// </summary>
public static bool operator ==(SimpleRegistrationFieldValues one, SimpleRegistrationFieldValues other) {
+ if ((object)one == null && (object)other == null) return true;
+ if ((object)one == null ^ (object)other == null) return false;
return one.Equals(other);
}
/// <summary>
/// Tests inequality of two <see cref="SimpleRegistrationFieldValues"/> objects.
/// </summary>
public static bool operator !=(SimpleRegistrationFieldValues one, SimpleRegistrationFieldValues other) {
- return !one.Equals(other);
+ return !(one == other);
}
/// <summary>
/// Tests equality of two <see cref="SimpleRegistrationFieldValues"/> objects.
diff --git a/src/DotNetOpenId/Extensions/SimpleRegistrationRequestFields.cs b/src/DotNetOpenId/Extensions/SimpleRegistrationRequestFields.cs index 32be3c9..46344b8 100644 --- a/src/DotNetOpenId/Extensions/SimpleRegistrationRequestFields.cs +++ b/src/DotNetOpenId/Extensions/SimpleRegistrationRequestFields.cs @@ -131,8 +131,7 @@ namespace DotNetOpenId.Extensions { /// </summary>
public static SimpleRegistrationRequestFields ReadFromRequest(IRequest request) {
var fields = new SimpleRegistrationRequestFields();
- ((IExtensionRequest)fields).ReadFromRequest(request);
- return fields;
+ return ((IExtensionRequest)fields).ReadFromRequest(request) ? fields : null;
}
#region IExtensionRequest Members
@@ -197,13 +196,15 @@ TimeZone = '{8}'", Nickname, Email, FullName, BirthDate, Gender, PostalCode, Cou /// Tests equality between two <see cref="SimpleRegistrationRequestFields"/> structs.
/// </summary>
public static bool operator ==(SimpleRegistrationRequestFields one, SimpleRegistrationRequestFields other) {
+ if ((object)one == null && (object)other == null) return true;
+ if ((object)one == null ^ (object)other == null) return false;
return one.Equals(other);
- }
+ }
/// <summary>
/// Tests inequality between two <see cref="SimpleRegistrationRequestFields"/> structs.
/// </summary>
public static bool operator !=(SimpleRegistrationRequestFields one, SimpleRegistrationRequestFields other) {
- return !one.Equals(other);
+ return !(one == other);
}
/// <summary>
/// Tests equality between two <see cref="SimpleRegistrationRequestFields"/> structs.
|