Merge pull request #819 from brendanzagaeski/patch-1

Bug 15574. XML deserialization recursion: add array type to known_types?

diff --git a/mcs/class/System.Runtime.Serialization/System.Runtime.Serialization/DataContractSerializer.cs b/mcs/class/System.Runtime.Serialization/System.Runtime.Serialization/DataContractSerializer.cs
index f3c707e1e77842557bd32261c8414e46e788b528..8e713d78eb17b74b356b275963efe1fce6d35c9c 100755 (executable)
--- a/mcs/class/System.Runtime.Serialization/System.Runtime.Serialization/DataContractSerializer.cs
+++ b/mcs/class/System.Runtime.Serialization/System.Runtime.Serialization/DataContractSerializer.cs
@@ -248,8 +248,10 @@ namespace System.Runtime.Serialization
                                return;
 
                        Type elementType = type;
-                       if (type.HasElementType)
+                       if (type.HasElementType) {
+                               known_types.Add (type);
                                elementType = type.GetElementType ();
+                       }
 
                        known_types.Add (elementType);