Merge branch 'master' of https://github.com/RicoSuter/NJsonSchema

RicoSuter · RicoSuter · commit e045ae82b55d · 2022-09-16T17:57:05.000+02:00
diff --git a/src/NJsonSchema/Converters/JsonExceptionConverter.cs b/src/NJsonSchema/Converters/JsonExceptionConverter.cs
@@ -158,14 +158,16 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
                 }
                 else
                 {
-                    field = GetField(objectType, "m_" + property.Value.Substring(0, 1).ToLowerInvariant() + property.Value.Substring(1));
+                    var fieldNameSuffix = property.Value.Substring(0, 1).ToLowerInvariant() + property.Value.Substring(1);
+
+                    field = GetField(objectType, "m_" + fieldNameSuffix);
                     if (field != null)
                     {
                         field.SetValue(value, propertyValue);
                     }
                     else
                     {
-                        field = GetField(objectType, "_" + property.Value.Substring(0, 1).ToLowerInvariant() + property.Value.Substring(1));
+                        field = GetField(objectType, "_" + fieldNameSuffix);
                         if (field != null)
                         {
                             field.SetValue(value, propertyValue);

Original file line number	Diff line number	Diff line change
`@@ -158,14 +158,16 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist`
`158`	`158`	`}`
`159`	`159`	`else`
`160`	`160`	`{`
`161`		`- field = GetField(objectType, "m_" + property.Value.Substring(0, 1).ToLowerInvariant() + property.Value.Substring(1));`
	`161`	`+ var fieldNameSuffix = property.Value.Substring(0, 1).ToLowerInvariant() + property.Value.Substring(1);`
	`162`	`+`
	`163`	`+ field = GetField(objectType, "m_" + fieldNameSuffix);`
`162`	`164`	`if (field != null)`
`163`	`165`	`{`
`164`	`166`	`field.SetValue(value, propertyValue);`
`165`	`167`	`}`
`166`	`168`	`else`
`167`	`169`	`{`
`168`		`- field = GetField(objectType, "_" + property.Value.Substring(0, 1).ToLowerInvariant() + property.Value.Substring(1));`
	`170`	`+ field = GetField(objectType, "_" + fieldNameSuffix);`
`169`	`171`	`if (field != null)`
`170`	`172`	`{`
`171`	`173`	`field.SetValue(value, propertyValue);`