@@ -44,11 +44,8 @@ private enum TimeZoneInfoResult
44
44
private const int MaxKeyLength = 255 ;
45
45
46
46
private readonly string _id ;
47
- private bool _displayNameSet ;
48
47
private string ? _displayName ;
49
- private bool _standardDisplayNameSet ;
50
48
private string ? _standardDisplayName ;
51
- private bool _daylightDisplayNameSet ;
52
49
private string ? _daylightDisplayName ;
53
50
private readonly TimeSpan _baseUtcOffset ;
54
51
private readonly bool _supportsDaylightSavingTime ;
@@ -153,11 +150,8 @@ public string DisplayName
153
150
{
154
151
get
155
152
{
156
- if ( _displayName == null && ! _displayNameSet )
157
- {
153
+ if ( _displayName == null )
158
154
Interlocked . CompareExchange ( ref _displayName , PopulateDisplayName ( ) , null ) ;
159
- _displayNameSet = true ;
160
- }
161
155
162
156
return _displayName ?? string . Empty ;
163
157
}
@@ -167,11 +161,8 @@ public string StandardName
167
161
{
168
162
get
169
163
{
170
- if ( _standardDisplayName == null && ! _standardDisplayNameSet )
171
- {
164
+ if ( _standardDisplayName == null )
172
165
Interlocked . CompareExchange ( ref _standardDisplayName , PopulateStandardDisplayName ( ) , null ) ;
173
- _standardDisplayNameSet = true ;
174
- }
175
166
176
167
return _standardDisplayName ?? string . Empty ;
177
168
}
@@ -181,11 +172,8 @@ public string DaylightName
181
172
{
182
173
get
183
174
{
184
- if ( _daylightDisplayName == null && ! _daylightDisplayNameSet )
185
- {
175
+ if ( _daylightDisplayName == null )
186
176
Interlocked . CompareExchange ( ref _daylightDisplayName , PopulateDaylightDisplayName ( ) , null ) ;
187
- _daylightDisplayNameSet = true ;
188
- }
189
177
190
178
return _daylightDisplayName ?? string . Empty ;
191
179
}
@@ -1002,11 +990,8 @@ private TimeZoneInfo(
1002
990
_id = id ;
1003
991
_baseUtcOffset = baseUtcOffset ;
1004
992
_displayName = displayName ;
1005
- _displayNameSet = true ;
1006
993
_standardDisplayName = standardDisplayName ;
1007
- _standardDisplayNameSet = true ;
1008
994
_daylightDisplayName = disableDaylightSavingTime ? null : daylightDisplayName ;
1009
- _daylightDisplayNameSet = true ;
1010
995
_supportsDaylightSavingTime = adjustmentRulesSupportDst && ! disableDaylightSavingTime ;
1011
996
_adjustmentRules = adjustmentRules ;
1012
997
@@ -1027,9 +1012,9 @@ public static TimeZoneInfo CreateCustomTimeZone(
1027
1012
return new TimeZoneInfo (
1028
1013
id ,
1029
1014
baseUtcOffset ,
1030
- displayName ,
1031
- standardDisplayName ,
1032
- standardDisplayName ,
1015
+ displayName ?? string . Empty ,
1016
+ standardDisplayName ?? string . Empty ,
1017
+ standardDisplayName ?? string . Empty ,
1033
1018
adjustmentRules : null ,
1034
1019
disableDaylightSavingTime : false ,
1035
1020
hasIanaId ) ;
@@ -1049,9 +1034,9 @@ public static TimeZoneInfo CreateCustomTimeZone(
1049
1034
return CreateCustomTimeZone (
1050
1035
id ,
1051
1036
baseUtcOffset ,
1052
- displayName ,
1053
- standardDisplayName ,
1054
- daylightDisplayName ,
1037
+ displayName ?? string . Empty ,
1038
+ standardDisplayName ?? string . Empty ,
1039
+ daylightDisplayName ?? string . Empty ,
1055
1040
adjustmentRules ,
1056
1041
disableDaylightSavingTime : false ) ;
1057
1042
}
@@ -1078,9 +1063,9 @@ public static TimeZoneInfo CreateCustomTimeZone(
1078
1063
return new TimeZoneInfo (
1079
1064
id ,
1080
1065
baseUtcOffset ,
1081
- displayName ,
1082
- standardDisplayName ,
1083
- daylightDisplayName ,
1066
+ displayName ?? string . Empty ,
1067
+ standardDisplayName ?? string . Empty ,
1068
+ daylightDisplayName ?? string . Empty ,
1084
1069
adjustmentRules ,
1085
1070
disableDaylightSavingTime ,
1086
1071
hasIanaId ) ;
@@ -1151,11 +1136,8 @@ private TimeZoneInfo(SerializationInfo info, StreamingContext context)
1151
1136
1152
1137
_id = ( string ) info . GetValue ( "Id" , typeof ( string ) ) ! ; // Do not rename (binary serialization)
1153
1138
_displayName = ( string ? ) info . GetValue ( "DisplayName" , typeof ( string ) ) ; // Do not rename (binary serialization)
1154
- _displayNameSet = true ;
1155
1139
_standardDisplayName = ( string ? ) info . GetValue ( "StandardName" , typeof ( string ) ) ; // Do not rename (binary serialization)
1156
- _standardDisplayNameSet = true ;
1157
1140
_daylightDisplayName = ( string ? ) info . GetValue ( "DaylightName" , typeof ( string ) ) ; // Do not rename (binary serialization)
1158
- _daylightDisplayNameSet = true ;
1159
1141
_baseUtcOffset = ( TimeSpan ) info . GetValue ( "BaseUtcOffset" , typeof ( TimeSpan ) ) ! ; // Do not rename (binary serialization)
1160
1142
_adjustmentRules = ( AdjustmentRule [ ] ? ) info . GetValue ( "AdjustmentRules" , typeof ( AdjustmentRule [ ] ) ) ; // Do not rename (binary serialization)
1161
1143
_supportsDaylightSavingTime = ( bool ) info . GetValue ( "SupportsDaylightSavingTime" , typeof ( bool ) ) ! ; // Do not rename (binary serialization)
0 commit comments