Merge pull request #1123 from Unity-Technologies/avoid-timezone-exceptions

joshpeterson · web-flow · commit 80428dd322aa · 2019-01-15T13:38:24.000-05:00
Don't use exceptions for time zones (case 1100856)
diff --git a/mcs/class/corlib/System/TimeZoneInfo.cs b/mcs/class/corlib/System/TimeZoneInfo.cs
@@ -209,7 +209,8 @@ static TimeZoneInfo CreateLocal ()
 					string tzName = null;
 					if (!TryGetNameFromPath (tzFilePath, out tzName))
 						tzName = "Local";
-					return FindSystemTimeZoneByFileName (tzName, tzFilePath);
+					if (File.Exists(tzFilePath))
+						return FindSystemTimeZoneByFileName (tzName, tzFilePath);
 				} catch (TimeZoneNotFoundException) {
 					continue;
 				}
@@ -1561,4 +1562,4 @@ public override string ToString ()
 	}
 #endif
 	}
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -209,7 +209,8 @@ static TimeZoneInfo CreateLocal ()`
`209`	`209`	`string tzName = null;`
`210`	`210`	`if (!TryGetNameFromPath (tzFilePath, out tzName))`
`211`	`211`	`tzName = "Local";`
`212`		`- return FindSystemTimeZoneByFileName (tzName, tzFilePath);`
	`212`	`+ if (File.Exists(tzFilePath))`
	`213`	`+ return FindSystemTimeZoneByFileName (tzName, tzFilePath);`
`213`	`214`	`} catch (TimeZoneNotFoundException) {`
`214`	`215`	`continue;`
`215`	`216`	`}`
`@@ -1561,4 +1562,4 @@ public override string ToString ()`
`1561`	`1562`	`}`
`1562`	`1563`	`#endif`
`1563`	`1564`	`}`
`1564`		`-}`
	`1565`	`+}`