Fix ArrayConverter error for nullable types

JKorf · Jul 5, 2024 · 6951f31 · 6951f31
1 parent 630f85e
commit 6951f31
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/CryptoExchange.Net/Converters/SystemTextJson/ArrayConverter.cs b/CryptoExchange.Net/Converters/SystemTextJson/ArrayConverter.cs
@@ -32,6 +32,7 @@ private class ArrayPropertyInfo
             public ArrayPropertyAttribute ArrayProperty { get; set; } = null!;
             public Type? JsonConverterType { get; set; }
             public bool DefaultDeserialization { get; set; }
+            public Type TargetType { get; set; }
         }
 
         private class ArrayConverterInner<T> : JsonConverter<T>
@@ -70,7 +71,8 @@ private static List<ArrayPropertyInfo> CacheTypeAttributes(Type type)
                         ArrayProperty = att,
                         PropertyInfo = property,
                         DefaultDeserialization = property.GetCustomAttribute<JsonConversionAttribute>() != null,
-                        JsonConverterType = property.GetCustomAttribute<JsonConverterAttribute>()?.ConverterType
+                        JsonConverterType = property.GetCustomAttribute<JsonConverterAttribute>()?.ConverterType,
+                        TargetType = Nullable.GetUnderlyingType(property.PropertyType) ?? property.PropertyType
                     });
                 }
 
@@ -96,8 +98,7 @@ private static object ParseObject(ref Utf8JsonReader reader, object result, Type
                     if (attribute == null)
                         continue;
 
-                    var targetType = attribute.PropertyInfo.PropertyType;
-
+                    var targetType = attribute.TargetType;
                     object? value = null;
                     if (attribute.JsonConverterType != null)
                     {
@@ -124,7 +125,7 @@ private static object ParseObject(ref Utf8JsonReader reader, object result, Type
                         };
                     }
 
-                    attribute.PropertyInfo.SetValue(result, value == null ? null : Convert.ChangeType(value, attribute.PropertyInfo.PropertyType, CultureInfo.InvariantCulture));
+                    attribute.PropertyInfo.SetValue(result, value == null ? null : Convert.ChangeType(value, targetType, CultureInfo.InvariantCulture));
 
                     index++;
                 }