Changed ToLocalTime and ToUniversalTime helper methods in BsonUtils. These helper methods exist because .NET does funny things when you call ToLocalTime or ToUniversalTime on DateTime.MinValue or MaxValue. Removed the kind parameter from the ToLocalTime helper method. The only two places that passed a value other than Local now deal with that at the calling site.

Author: rstam

Bson/BsonUtils.cs

@@ -97,28 +97,20 @@ public static string ToHexString(byte[] bytes)
         /// Converts a DateTime to local time (with special handling for MinValue and MaxValue).
         /// </summary>
         /// <param name="dateTime">A DateTime.</param>
-        /// <param name="kind">A DateTimeKind.</param>
         /// <returns>The DateTime in local time.</returns>
-        public static DateTime ToLocalTime(DateTime dateTime, DateTimeKind kind)
+        public static DateTime ToLocalTime(DateTime dateTime)
         {
-            if (dateTime.Kind == kind)
+            if (dateTime == DateTime.MinValue)
             {
-                return dateTime;
+                return DateTime.SpecifyKind(DateTime.MinValue, DateTimeKind.Local);
+            }
+            else if (dateTime == DateTime.MaxValue)
+            {
+                return DateTime.SpecifyKind(DateTime.MaxValue, DateTimeKind.Local);
             }
             else
             {
-                if (dateTime == DateTime.MinValue)
-                {
-                    return DateTime.SpecifyKind(DateTime.MinValue, kind);
-                }
-                else if (dateTime == DateTime.MaxValue)
-                {
-                    return DateTime.SpecifyKind(DateTime.MaxValue, kind);
-                }
-                else
-                {
-                    return DateTime.SpecifyKind(dateTime.ToLocalTime(), kind);
-                }
+                return dateTime.ToLocalTime();
             }
         }
 
@@ -140,26 +132,18 @@ public static long ToMillisecondsSinceEpoch(DateTime dateTime)
         /// <returns>The DateTime in UTC.</returns>
         public static DateTime ToUniversalTime(DateTime dateTime)
         {
-            if (dateTime.Kind == DateTimeKind.Utc)
+            if (dateTime == DateTime.MinValue)
+            {
+                return DateTime.SpecifyKind(DateTime.MinValue, DateTimeKind.Utc);
+            }
+            else if (dateTime == DateTime.MaxValue)
             {
-                return dateTime;
+                return DateTime.SpecifyKind(DateTime.MaxValue, DateTimeKind.Utc);
             }
             else
             {
-                if (dateTime == DateTime.MinValue)
-                {
-                    return DateTime.SpecifyKind(DateTime.MinValue, DateTimeKind.Utc);
-                }
-                else if (dateTime == DateTime.MaxValue)
-                {
-                    return DateTime.SpecifyKind(DateTime.MaxValue, DateTimeKind.Utc);
-                }
-                else
-                {
-                    return dateTime.ToUniversalTime();
-                }
+                return dateTime.ToUniversalTime();
             }
-
         }
 
         /// <summary>

Bson/IO/JsonReader.cs

@@ -735,7 +735,7 @@ private string FormatInvalidTokenMessage(JsonToken token)
         private string FormatJavaScriptDateTimeString(DateTime dateTime)
         {
             var utc = BsonUtils.ToUniversalTime(dateTime);
-            var local = BsonUtils.ToLocalTime(utc, DateTimeKind.Local);
+            var local = BsonUtils.ToLocalTime(utc);
             var offset = local - utc;
             var offsetSign = "+";
             if (offset < TimeSpan.Zero)

Bson/ObjectModel/BsonDateTime.cs

@@ -238,7 +238,7 @@ public override int GetHashCode()
         public DateTime ToLocalTime()
         {
             var utcDateTime = BsonUtils.ToDateTimeFromMillisecondsSinceEpoch(_millisecondsSinceEpoch);
-            return BsonUtils.ToLocalTime(utcDateTime, DateTimeKind.Local);
+            return BsonUtils.ToLocalTime(utcDateTime);
         }
 
         /// <summary>

Bson/Serialization/Serializers/BsonPrimitiveSerializers.cs

@@ -223,7 +223,7 @@ public override object Deserialize(
                 {
                     case DateTimeKind.Local:
                     case DateTimeKind.Unspecified:
-                        value = BsonUtils.ToLocalTime(value, dateTimeOptions.Kind);
+                        value = DateTime.SpecifyKind(BsonUtils.ToLocalTime(value), dateTimeOptions.Kind);
                         break;
                     case DateTimeKind.Utc:
                         value = BsonUtils.ToUniversalTime(value);

Bson/Serialization/Serializers/BsonValueSerializers.cs

@@ -414,7 +414,7 @@ public override object Deserialize(
                         {
                             case DateTimeKind.Local:
                             case DateTimeKind.Unspecified:
-                                dateTime = BsonUtils.ToLocalTime(dateTime, dateTimeOptions.Kind);
+                                dateTime = DateTime.SpecifyKind(BsonUtils.ToLocalTime(dateTime), dateTimeOptions.Kind);
                                 break;
                             case DateTimeKind.Utc:
                                 dateTime = BsonUtils.ToUniversalTime(dateTime);