TimeZoneInfo.Local must be cached, otherwise reference comparisons fa…

…il later on. This fixes an issue reported here: http://lists.ximian.com/pipermail/monotouch/2012-September/011784.html
mono · Sep 17, 2012 · 142e70f · 142e70f
1 parent 09e213a
commit 142e70f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/mcs/class/System.Core/System/TimeZoneInfo.cs b/mcs/class/System.Core/System/TimeZoneInfo.cs
@@ -89,7 +89,7 @@ public sealed partial class TimeZoneInfo : IEquatable<TimeZoneInfo>, ISerializab
 					local = ZoneInfoDB.Default;
 #elif MONOTOUCH
 					using (Stream stream = GetMonoTouchDefault ()) {
-						return BuildFromStream ("Local", stream);
+						local = BuildFromStream ("Local", stream);
 					}
 #elif LIBC
 					try {

diff --git a/mcs/class/System.Core/Test/System/TimeZoneInfoTest.cs b/mcs/class/System.Core/Test/System/TimeZoneInfoTest.cs
@@ -384,6 +384,15 @@ public void ConvertFromToUtc ()
 				Assert.AreEqual (utc, back);
 
 			}
+
+			[Test]
+			public void ConvertToTimeZone ()
+			{
+				if (Environment.OSVersion.Platform != PlatformID.Unix)
+					return;
+
+				TimeZoneInfo.ConvertTime (DateTime.Now, TimeZoneInfo.FindSystemTimeZoneById("Pacific/Auckland"));
+			}
 		}
 
 		[TestFixture]