sc

StefH · StefH · commit 643bf5af8d1d · 2025-11-15T10:12:34.000+01:00
diff --git a/src/System.Linq.Dynamic.Core.NewtonsoftJson/Utils/NormalizeUtils.cs b/src/System.Linq.Dynamic.Core.NewtonsoftJson/Utils/NormalizeUtils.cs
@@ -50,12 +50,13 @@ private static void MergeSchema(Dictionary<string, JsonValueInfo> schema, JObjec
         {
             if (prop.Value is JObject nested)
             {
-                if (!schema.ContainsKey(prop.Name))
+                if (!schema.TryGetValue(prop.Name, out var jsonValueInfo))
                 {
-                    schema[prop.Name] = new JsonValueInfo(JTokenType.Object, new Dictionary<string, JsonValueInfo>());
+                    jsonValueInfo = new JsonValueInfo(JTokenType.Object, new Dictionary<string, JsonValueInfo>());
+                    schema[prop.Name] = jsonValueInfo;
                 }
 
-                MergeSchema((Dictionary<string, JsonValueInfo>)schema[prop.Name].Value!, nested);
+                MergeSchema((Dictionary<string, JsonValueInfo>)jsonValueInfo.Value!, nested);
             }
             else
             {
diff --git a/src/System.Linq.Dynamic.Core.SystemTextJson/Utils/NormalizeUtils.cs b/src/System.Linq.Dynamic.Core.SystemTextJson/Utils/NormalizeUtils.cs
@@ -69,12 +69,13 @@ private static void MergeSchema(Dictionary<string, JsonValueInfo> schema, JsonOb
         {
             if (prop.Value is JsonObject nested)
             {
-                if (!schema.ContainsKey(prop.Key))
+                if (!schema.TryGetValue(prop.Key, out var jsonValueInfo))
                 {
-                    schema[prop.Key] = new JsonValueInfo(JsonValueKind.Object, new Dictionary<string, JsonValueInfo>());
+                    jsonValueInfo = new JsonValueInfo(JsonValueKind.Object, new Dictionary<string, JsonValueInfo>());
+                    schema[prop.Key] = jsonValueInfo;
                 }
 
-                MergeSchema((Dictionary<string, JsonValueInfo>)schema[prop.Key].Value!, nested);
+                MergeSchema((Dictionary<string, JsonValueInfo>)jsonValueInfo.Value!, nested);
             }
             else
             {

Original file line number	Diff line number	Diff line change
`@@ -50,12 +50,13 @@ private static void MergeSchema(Dictionary<string, JsonValueInfo> schema, JObjec`
`50`	`50`	`{`
`51`	`51`	`if (prop.Value is JObject nested)`
`52`	`52`	`{`
`53`		`- if (!schema.ContainsKey(prop.Name))`
	`53`	`+ if (!schema.TryGetValue(prop.Name, out var jsonValueInfo))`
`54`	`54`	`{`
`55`		`- schema[prop.Name] = new JsonValueInfo(JTokenType.Object, new Dictionary<string, JsonValueInfo>());`
	`55`	`+ jsonValueInfo = new JsonValueInfo(JTokenType.Object, new Dictionary<string, JsonValueInfo>());`
	`56`	`+ schema[prop.Name] = jsonValueInfo;`
`56`	`57`	`}`
`57`	`58`
`58`		`- MergeSchema((Dictionary<string, JsonValueInfo>)schema[prop.Name].Value!, nested);`
	`59`	`+ MergeSchema((Dictionary<string, JsonValueInfo>)jsonValueInfo.Value!, nested);`
`59`	`60`	`}`
`60`	`61`	`else`
`61`	`62`	`{`
Original file line number	Diff line number	Diff line change
`@@ -69,12 +69,13 @@ private static void MergeSchema(Dictionary<string, JsonValueInfo> schema, JsonOb`
`69`	`69`	`{`
`70`	`70`	`if (prop.Value is JsonObject nested)`
`71`	`71`	`{`
`72`		`- if (!schema.ContainsKey(prop.Key))`
	`72`	`+ if (!schema.TryGetValue(prop.Key, out var jsonValueInfo))`
`73`	`73`	`{`
`74`		`- schema[prop.Key] = new JsonValueInfo(JsonValueKind.Object, new Dictionary<string, JsonValueInfo>());`
	`74`	`+ jsonValueInfo = new JsonValueInfo(JsonValueKind.Object, new Dictionary<string, JsonValueInfo>());`
	`75`	`+ schema[prop.Key] = jsonValueInfo;`
`75`	`76`	`}`
`76`	`77`
`77`		`- MergeSchema((Dictionary<string, JsonValueInfo>)schema[prop.Key].Value!, nested);`
	`78`	`+ MergeSchema((Dictionary<string, JsonValueInfo>)jsonValueInfo.Value!, nested);`
`78`	`79`	`}`
`79`	`80`	`else`
`80`	`81`	`{`