View | Details | Raw Unified | Return to bug 43805
Collapse All | Expand All

(-)file_not_specified_in_diff (-16 / +12 lines)
Line  Link Here
0
-- a/mcs/class/corlib/System/TimeZoneInfo.cs
0
++ b/mcs/class/corlib/System/TimeZoneInfo.cs
Lines 861-867 namespace System Link Here
861
			AdjustmentRule rule = GetApplicableRule (dateTime);
861
			AdjustmentRule rule = GetApplicableRule (dateTime);
862
			if (rule != null) {
862
			if (rule != null) {
863
				DateTime tpoint = TransitionPoint (rule.DaylightTransitionEnd, dateTime.Year);
863
				DateTime tpoint = TransitionPoint (rule.DaylightTransitionEnd, dateTime.Year);
864
				if (dateTime > tpoint - rule.DaylightDelta  && dateTime <= tpoint)
864
				if (dateTime > tpoint - rule.DaylightDelta && dateTime <= tpoint)
865
					return true;
865
					return true;
866
			}
866
			}
867
				
867
				
Lines 1172-1191 namespace System Link Here
1172
					return false;
1172
					return false;
1173
			}
1173
			}
1174
1174
1175
			for (var i =  transitions.Count - 1; i >= 0; i--) {
1175
			AdjustmentRule current = GetApplicableRule(date);
1176
				var pair = transitions [i];
1176
			if (current != null) {
1177
				DateTime ttime = pair.Key;
1177
				DateTime tStart = TransitionPoint(current.DaylightTransitionStart, date.Year);
1178
				TimeType ttype = pair.Value;
1178
				DateTime tEnd = TransitionPoint(current.DaylightTransitionEnd, date.Year);
1179
1179
				if ((date >= tStart) && (date <= tEnd)) {
1180
				if (ttime > date)
1180
					offset = baseUtcOffset + current.DaylightDelta; 
1181
					continue;
1181
					isDst = true;
1182
1182
					return true;
1183
				offset =  new TimeSpan (0, 0, ttype.Offset);
1183
				}
1184
				isDst = ttype.IsDst;
1185
1186
				return true;
1187
			}
1184
			}
1188
1189
			return false;
1185
			return false;
1190
		}
1186
		}
1191
1187
Lines 1475-1481 namespace System Link Here
1475
1471
1476
			if (zone.IsAmbiguousTime (time)) {
1472
			if (zone.IsAmbiguousTime (time)) {
1477
				isAmbiguousLocalDst = true;
1473
				isAmbiguousLocalDst = true;
1478
				return baseOffset;
1474
//				return baseOffset;
1479
			}
1475
			}
1480
1476
1481
			return zone.GetUtcOffset (time, out isDaylightSavings);
1477
			return zone.GetUtcOffset (time, out isDaylightSavings);

Return to bug 43805