huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Quick fix: Missed `null` checks in 7dc0508

This commit is contained in:
Doug Bunting 2015-05-11 22:12:28 -07:00
parent 89b5f5b1aa
commit 294fb5c3cd
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Microsoft.AspNet.Razor/TagHelpers/TypeBasedTagHelperDescriptorComparer.cs
View File

@ -42,7 +42,8 @@ namespace Microsoft.AspNet.Razor.TagHelpers
return true; return true;
} }
return string.Equals(descriptorX.AssemblyName, descriptorY.AssemblyName, StringComparison.Ordinal) && return descriptorX != null &&
string.Equals(descriptorX.AssemblyName, descriptorY.AssemblyName, StringComparison.Ordinal) &&
string.Equals(descriptorX.TypeName, descriptorY.TypeName, StringComparison.Ordinal); string.Equals(descriptorX.TypeName, descriptorY.TypeName, StringComparison.Ordinal);
} }

10
test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/CaseSensitiveTagHelperAttributeComparer.cs
View File

@ -18,9 +18,13 @@ namespace Microsoft.AspNet.Razor.Runtime.TagHelpers
public bool Equals(IReadOnlyTagHelperAttribute attributeX, IReadOnlyTagHelperAttribute attributeY) public bool Equals(IReadOnlyTagHelperAttribute attributeX, IReadOnlyTagHelperAttribute attributeY)
{ {
return if (attributeX == attributeY)
attributeX == attributeY || {
// Normal comparer doesn't care about the Name case, in tests we do. return true;
}
// Normal comparer (TagHelperAttribute.Equals()) doesn't care about the Name case, in tests we do.
return attributeX != null &&
string.Equals(attributeX.Name, attributeY.Name, StringComparison.Ordinal) && string.Equals(attributeX.Name, attributeY.Name, StringComparison.Ordinal) &&
Equals(attributeX.Value, attributeY.Value); Equals(attributeX.Value, attributeY.Value);
} }