Merge pull request #20 from enrique-avalon/issue/19

Issue/19
pardahlman · Aug 3, 2017 · 1970046 · 1970046
2 parents ae4c9e0 + bb816ee
commit 1970046
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/Akeneo/Serialization/AttributeBaseConverter.cs b/src/Akeneo/Serialization/AttributeBaseConverter.cs
@@ -10,7 +10,11 @@ public class AttributeBaseConverter : JsonConverter
 		private static readonly Type Attribute = typeof(AttributeBase);
 		private const string AttributeTypeProp = "type";
 		private static readonly JsonSerializer SnakeCaseSerialzer =
-			new JsonSerializer {ContractResolver = AkeneoSerializerSettings.AkeneoContractResolver};
+			new JsonSerializer
+			{
+				ContractResolver = AkeneoSerializerSettings.AkeneoContractResolver,
+				NullValueHandling = NullValueHandling.Ignore
+			};
 
 		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
 		{

diff --git a/src/Akeneo/Serialization/ProductValueDataConverter.cs b/src/Akeneo/Serialization/ProductValueDataConverter.cs
@@ -48,11 +48,11 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 				}
 				if (array.First.Type == JTokenType.String)
 				{
-					return array.ToObject<List<string>>();
+					return array.ToObject<List<string>>(serializer);
 				}
 				if (array.First.Type == JTokenType.Object)
 				{
-					return array.ToObject<List<PriceProductValue>>();
+					return array.ToObject<List<PriceProductValue>>(serializer);
 				}
 				return serializer.Deserialize<List<PriceProductValue>>(reader);
 			}