Merge branch 'feat/json-api-dotnet#477' of https://github.com/wisepotato/JsonApiDotNetCore into feat/json-api-dotnet#477

maurei · maurei · commit f21862cc05b8 · 2019-05-17T11:25:56.000+02:00
diff --git a/src/JsonApiDotNetCore/Serialization/JsonApiDeSerializer.cs b/src/JsonApiDotNetCore/Serialization/JsonApiDeSerializer.cs
@@ -146,11 +146,11 @@ private object SetEntityAttributes(
             {
                 if (attributeValues.TryGetValue(attr.PublicAttributeName, out object newValue))
                 {
+                    if (attr.IsImmutable)
+                        continue;
                     var convertedValue = ConvertAttrValue(newValue, attr.PropertyInfo.PropertyType);
                     attr.SetValue(entity, convertedValue);
-
-                    if (attr.IsImmutable == false)
-                        _jsonApiContext.AttributesToUpdate[attr] = convertedValue;
+                    _jsonApiContext.AttributesToUpdate[attr] = convertedValue;
                 }
             }
 

Original file line number	Diff line number	Diff line change
`@@ -146,11 +146,11 @@ private object SetEntityAttributes(`
`146`	`146`	`{`
`147`	`147`	`if (attributeValues.TryGetValue(attr.PublicAttributeName, out object newValue))`
`148`	`148`	`{`
	`149`	`+ if (attr.IsImmutable)`
	`150`	`+ continue;`
`149`	`151`	`var convertedValue = ConvertAttrValue(newValue, attr.PropertyInfo.PropertyType);`
`150`	`152`	`attr.SetValue(entity, convertedValue);`
`151`		`-`
`152`		`- if (attr.IsImmutable == false)`
`153`		`- _jsonApiContext.AttributesToUpdate[attr] = convertedValue;`
	`153`	`+ _jsonApiContext.AttributesToUpdate[attr] = convertedValue;`
`154`	`154`	`}`
`155`	`155`	`}`
`156`	`156`