From 252704d416927118adfad17fcf41503cbec5bb3d Mon Sep 17 00:00:00 2001 From: James Newton-King Date: Sat, 2 Sep 2017 17:25:18 +1200 Subject: [PATCH] -Removed unused INullable conversion code --- Src/Newtonsoft.Json/Utilities/ConvertUtils.cs | 42 +------------------ 1 file changed, 1 insertion(+), 41 deletions(-) diff --git a/Src/Newtonsoft.Json/Utilities/ConvertUtils.cs b/Src/Newtonsoft.Json/Utilities/ConvertUtils.cs index e20b1848..aa693b03 100644 --- a/Src/Newtonsoft.Json/Utilities/ConvertUtils.cs +++ b/Src/Newtonsoft.Json/Utilities/ConvertUtils.cs @@ -578,7 +578,7 @@ namespace Newtonsoft.Json.Utilities } #endif #if HAVE_ADO_NET - // handle DBNull and INullable + // handle DBNull if (initialValue == DBNull.Value) { if (ReflectionUtils.IsNullable(targetType)) @@ -592,14 +592,6 @@ namespace Newtonsoft.Json.Utilities return ConvertResult.CannotConvertNull; } #endif -#if HAVE_ADO_NET - INullable nullable = initialValue as INullable; - if (nullable != null) - { - value = EnsureTypeAssignable(ToValue(nullable), initialType, targetType); - return ConvertResult.Success; - } -#endif if (targetType.IsInterface() || targetType.IsGenericTypeDefinition() || targetType.IsAbstract()) { @@ -675,38 +667,6 @@ namespace Newtonsoft.Json.Utilities throw new ArgumentException("Could not cast or convert from {0} to {1}.".FormatWith(CultureInfo.InvariantCulture, initialType?.ToString() ?? "{null}", targetType)); } -#if HAVE_ADO_NET - public static object ToValue(INullable nullableValue) - { - if (nullableValue == null) - { - return null; - } - else if (nullableValue is SqlInt32) - { - return ToValue((SqlInt32)nullableValue); - } - else if (nullableValue is SqlInt64) - { - return ToValue((SqlInt64)nullableValue); - } - else if (nullableValue is SqlBoolean) - { - return ToValue((SqlBoolean)nullableValue); - } - else if (nullableValue is SqlString) - { - return ToValue((SqlString)nullableValue); - } - else if (nullableValue is SqlDateTime) - { - return ToValue((SqlDateTime)nullableValue); - } - - throw new ArgumentException("Unsupported INullable type: {0}".FormatWith(CultureInfo.InvariantCulture, nullableValue.GetType())); - } -#endif - public static bool VersionTryParse(string input, out Version result) { #if HAVE_VERSION_TRY_PARSE