in MONODROID profile, TimeZoneInfo should not return null entry.
authorAtsushi Eno <atsushieno@veritas-vos-liberabit.com>
Tue, 11 Sep 2012 12:53:54 +0000 (21:53 +0900)
committerAtsushi Eno <atsushieno@veritas-vos-liberabit.com>
Tue, 11 Sep 2012 12:53:54 +0000 (21:53 +0900)
mcs/class/System.Core/System/TimeZoneInfo.cs

index 5e7953b85a5f3b2b8a6757bd0fd7ff6afc3cc6db..edfe93ccaf792edbdc80a7a223ace00d641e8857 100644 (file)
@@ -605,7 +605,9 @@ namespace System
 #endif
 #if MONODROID
                        foreach (string id in ZoneInfoDB.GetAvailableIds ()) {
-                               systemTimeZones.Add (ZoneInfoDB.GetTimeZone (id));
+                               var tz = ZoneInfoDB.GetTimeZone (id);
+                               if (tz != null)
+                                       systemTimeZones.Add (tz);
                        }
 #elif MONOTOUCH
                                if (systemTimeZones.Count == 0) {