Fix bug when element has both content and xsi:nil present.

janno-p · Mar 23, 2016 · 9987e64 · 9987e64
1 parent 24d697c
commit 9987e64
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 10 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,3 +1,6 @@
+#### 1.0.0-beta014 - 23.03.2016
+* Fix deserialization bug when element with xsi:nil attribute has content.
+
 #### 1.0.0-beta013 - 22.03.2016
 * Fix X-Road namespace import when title attributes are used.
 

diff --git a/src/XRoadLib/Extensions/XmlReaderExtensions.cs b/src/XRoadLib/Extensions/XmlReaderExtensions.cs
@@ -76,6 +76,30 @@ public static void ReadToEndElement(this XmlReader reader)
             { }
         }
 
+        public static void ConsumeNilElement(this XmlReader reader, bool isNil)
+        {
+            if (!isNil)
+                return;
+
+            if (reader.IsEmptyElement)
+            {
+                reader.Read();
+                return;
+            }
+
+            var content = reader.ReadString();
+            if (!string.IsNullOrEmpty(content))
+                throw XRoadException.InvalidQuery($@"An element labeled with `xsi:nil=""true""` must be empty, but had `{content}` as content.");
+
+            reader.ReadToEndElement();
+        }
+
+        public static void ConsumeUnusedElement(this XmlReader reader)
+        {
+            if (reader.IsEmptyElement) reader.Read();
+            else reader.ReadToEndElement();
+        }
+
         public static bool IsCurrentElement(this XmlReader reader, int depth, string name, string @namespace = "")
         {
             return reader.NodeType == XmlNodeType.Element && reader.Depth == depth && reader.LocalName == name && reader.NamespaceURI == @namespace;

diff --git a/src/XRoadLib/Serialization/Mapping/AllTypeMap.cs b/src/XRoadLib/Serialization/Mapping/AllTypeMap.cs
@@ -64,8 +64,7 @@ private static bool ReadPropertyValue(XmlReader reader, IPropertyMap propertyMap
             var propertyNode = templateNode[templateName, message.Version];
             if (propertyNode == null)
             {
-                if (reader.IsEmptyElement) reader.Read();
-                else reader.ReadToEndElement();
+                reader.ConsumeUnusedElement();
                 return false;
             }
 
@@ -76,8 +75,7 @@ private static bool ReadPropertyValue(XmlReader reader, IPropertyMap propertyMap
             if ((isNull || propertyMap.Deserialize(reader, dtoObject, propertyNode, message)) && !string.IsNullOrWhiteSpace(templateName))
                 dtoObject.OnMemberDeserialized(templateName);
 
-            if (isNull && reader.IsEmptyElement)
-                reader.Read();
+            reader.ConsumeNilElement(isNull);
 
             return propertyNode.IsRequired;
         }

diff --git a/src/XRoadLib/Serialization/Mapping/PropertyMap.cs b/src/XRoadLib/Serialization/Mapping/PropertyMap.cs
@@ -40,8 +40,7 @@ public bool Deserialize(XmlReader reader, IXRoadSerializable dtoObject, IXmlTemp
         {
             if (message.EnableFiltering && !filters.Contains(message.FilterName))
             {
-                if (reader.IsEmptyElement) reader.Read();
-                else reader.ReadToEndElement();
+                reader.ConsumeUnusedElement();
                 return false;
             }
 

diff --git a/src/XRoadLib/Serialization/Mapping/SequenceTypeMap.cs b/src/XRoadLib/Serialization/Mapping/SequenceTypeMap.cs
@@ -55,8 +55,7 @@ private static void ReadPropertyValue(XmlReader reader, IPropertyMap propertyMap
         {
             if (propertyNode == null)
             {
-                if (reader.IsEmptyElement) reader.Read();
-                else reader.ReadToEndElement();
+                reader.ConsumeUnusedElement();
                 return;
             }
 
@@ -68,8 +67,7 @@ private static void ReadPropertyValue(XmlReader reader, IPropertyMap propertyMap
             if ((isNull || propertyMap.Deserialize(reader, dtoObject, propertyNode, message)) && !string.IsNullOrWhiteSpace(templateName))
                 dtoObject.OnMemberDeserialized(templateName);
 
-            if (isNull && reader.IsEmptyElement)
-                reader.Read();
+            reader.ConsumeNilElement(isNull);
         }
 
         private IXmlTemplateNode MoveToProperty(XmlReader reader, IEnumerator<IPropertyMap> properties, IXmlTemplateNode templateNode, XRoadMessage message, bool validateRequired)