Merge pull request #21 from Dini001/patch-1

morrisjdev · web-flow · commit 7550063bcca8 · 2020-03-18T19:04:27.000+01:00
Deserialize nullable with null value
diff --git a/FileContextCore/Serializer/SerializerHelper.cs b/FileContextCore/Serializer/SerializerHelper.cs
@@ -13,13 +13,13 @@ static class SerializerHelper
     {
         public static object Deserialize(this string input, Type type)
         {
-	        type = Nullable.GetUnderlyingType(type) ?? type;
-
             if (string.IsNullOrEmpty(input))
             {
                 return type.GetDefaultValue();
             }
 
+	    type = Nullable.GetUnderlyingType(type) ?? type;
+
             if (type == typeof(DateTimeOffset))
             {
                 return DateTimeOffset.Parse(input, CultureInfo.InvariantCulture);

Original file line number	Diff line number	Diff line change
`@@ -13,13 +13,13 @@ static class SerializerHelper`
`13`	`13`	`{`
`14`	`14`	`public static object Deserialize(this string input, Type type)`
`15`	`15`	`{`
`16`		`- type = Nullable.GetUnderlyingType(type) ?? type;`
`17`		`-`
`18`	`16`	`if (string.IsNullOrEmpty(input))`
`19`	`17`	`{`
`20`	`18`	`return type.GetDefaultValue();`
`21`	`19`	`}`
`22`	`20`
	`21`	`+ type = Nullable.GetUnderlyingType(type) ?? type;`
	`22`	`+`
`23`	`23`	`if (type == typeof(DateTimeOffset))`
`24`	`24`	`{`
`25`	`25`	`return DateTimeOffset.Parse(input, CultureInfo.InvariantCulture);`