From ee03f85704f9bfa20f8fb3455c6c9fecdf372368 Mon Sep 17 00:00:00 2001 From: Chris Cameron Date: Thu, 15 Feb 2018 16:34:25 -0500 Subject: [PATCH] Removing bad token type check from AbstractGenericJsonConverter --- .../Json/AbstractGenericJsonConverterTest.cs | 13 +++++++++++++ .../Json/AbstractGenericJsonConverter.cs | 3 --- 2 files changed, 13 insertions(+), 3 deletions(-) create mode 100644 ICD.Common.Utils.Tests/Json/AbstractGenericJsonConverterTest.cs diff --git a/ICD.Common.Utils.Tests/Json/AbstractGenericJsonConverterTest.cs b/ICD.Common.Utils.Tests/Json/AbstractGenericJsonConverterTest.cs new file mode 100644 index 0000000..c43fd6d --- /dev/null +++ b/ICD.Common.Utils.Tests/Json/AbstractGenericJsonConverterTest.cs @@ -0,0 +1,13 @@ +using NUnit.Framework; + +namespace ICD.Common.Utils.Tests.Json +{ + public abstract class AbstractGenericJsonConverterTest + { + [Test] + public abstract void WriteJsonTest(); + + [Test] + public abstract void ReadJsonTest(); + } +} diff --git a/ICD.Common.Utils/Json/AbstractGenericJsonConverter.cs b/ICD.Common.Utils/Json/AbstractGenericJsonConverter.cs index 900b1ce..31a2a6e 100644 --- a/ICD.Common.Utils/Json/AbstractGenericJsonConverter.cs +++ b/ICD.Common.Utils/Json/AbstractGenericJsonConverter.cs @@ -45,9 +45,6 @@ namespace ICD.Common.Utils.Json public sealed override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer) { - if (reader.TokenType == JsonToken.Null) - return null; - return ReadJson(reader, (T)existingValue, serializer); }