Fix bug in EETypeOptionalFieldsBuilder

Optional field with value 0 should not compare equal to optional field that is not set.
dotnet · Feb 20, 2016 · 73337fb · 73337fb
1 parent fd7395a
commit 73337fb
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/Common/src/Internal/Runtime/EETypeOptionalFieldsBuilder.cs b/src/Common/src/Internal/Runtime/EETypeOptionalFieldsBuilder.cs
@@ -119,7 +119,9 @@ public override bool Equals(object obj)
 
             for (EETypeOptionalFieldsElement eTag = 0; eTag < EETypeOptionalFieldsElement.Count; eTag++)
             {
-                if (GetFieldValue(eTag, 0) != other.GetFieldValue(eTag, 0))
+                int index = (int)eTag;
+                if (_rgFields[index]._fieldPresent != other._rgFields[index]._fieldPresent ||
+                    (_rgFields[index]._fieldPresent && _rgFields[index]._value != other._rgFields[index]._value))
                     return false;
             }