Merge remote-tracking branch 'upstream/master' into 3.1.7

1 files changed, 6 insertions, 0 deletions

diff --git a/MediaBrowser.Common/Json/JsonDefaults.cs b/MediaBrowser.Common/Json/JsonDefaults.cs
index 9d30927db..5867cd4a0 100644
--- a/MediaBrowser.Common/Json/JsonDefaults.cs
+++ b/MediaBrowser.Common/Json/JsonDefaults.cs
@@ -29,8 +29,14 @@ namespace MediaBrowser.Common.Json
                 NumberHandling = JsonNumberHandling.AllowReadingFromString
             };
 
+            // Get built-in converters for fallback converting.
+            var baseNullableInt32Converter = (JsonConverter<int?>)options.GetConverter(typeof(int?));
+            var baseNullableInt64Converter = (JsonConverter<long?>)options.GetConverter(typeof(long?));
+
             options.Converters.Add(new JsonGuidConverter());
             options.Converters.Add(new JsonStringEnumConverter());
+            options.Converters.Add(new JsonNullableStructConverter<int>(baseNullableInt32Converter));
+            options.Converters.Add(new JsonNullableStructConverter<long>(baseNullableInt64Converter));
 
             return options;
         }