File tree Expand file tree Collapse file tree 1 file changed +10
-1
lines changed Expand file tree Collapse file tree 1 file changed +10
-1
lines changed Original file line number Diff line number Diff line change @@ -16,8 +16,11 @@ internal class MagicContractResolver<T> : JsonConverter<T>
16
16
{
17
17
public override T ? Read ( ref Utf8JsonReader reader , Type typeToConvert , JsonSerializerOptions options )
18
18
{
19
+ // ✅ Return default(T) if null is encountered
19
20
if ( reader . TokenType == JsonTokenType . Null )
20
- return default ; // ✅ Return default(T) if null is encountered
21
+ {
22
+ return default ;
23
+ }
21
24
22
25
// ✅ Handle primitive types before assuming it's complex
23
26
if ( PropertyMappingCache . IsSimpleType ( typeToConvert ) )
@@ -54,6 +57,12 @@ internal class MagicContractResolver<T> : JsonConverter<T>
54
57
return ( T ? ) ReadComplexObject ( ref reader , typeToConvert , options ) ;
55
58
}
56
59
60
+ // ✅ Return default(T) if EndArray is encountered
61
+ if ( reader . TokenType == JsonTokenType . EndArray )
62
+ {
63
+ return default ;
64
+ }
65
+
57
66
throw new JsonException ( $ "Unexpected JSON token: { reader . TokenType } when deserializing { typeToConvert . Name } .") ;
58
67
}
59
68
You can’t perform that action at this time.
0 commit comments