Skip to content
This repository has been archived by the owner on Jan 23, 2023. It is now read-only.

Simplify TimeZoneInfo.AdjustmentRule.Equals #8527

Merged
merged 1 commit into from
Dec 9, 2016
Merged

Simplify TimeZoneInfo.AdjustmentRule.Equals #8527

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 7 additions & 10 deletions src/mscorlib/src/System/TimeZoneInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4571,16 +4571,13 @@ internal bool HasDaylightSaving {

// IEquatable<AdjustmentRule>
public bool Equals(AdjustmentRule other) {
bool equals = (other != null
&& this.m_dateStart == other.m_dateStart
&& this.m_dateEnd == other.m_dateEnd
&& this.m_daylightDelta == other.m_daylightDelta
&& this.m_baseUtcOffsetDelta == other.m_baseUtcOffsetDelta);

equals = equals && this.m_daylightTransitionEnd.Equals(other.m_daylightTransitionEnd)
&& this.m_daylightTransitionStart.Equals(other.m_daylightTransitionStart);

return equals;
return other != null
&& m_dateStart == other.m_dateStart
&& m_dateEnd == other.m_dateEnd
&& m_daylightDelta == other.m_daylightDelta
&& m_baseUtcOffsetDelta == other.m_baseUtcOffsetDelta
&& m_daylightTransitionEnd.Equals(other.m_daylightTransitionEnd)
&& m_daylightTransitionStart.Equals(other.m_daylightTransitionStart);
}


Expand Down