From d0c24d73e54472274711fa814dfd8082d8a924ec Mon Sep 17 00:00:00 2001 From: brendanzagaeski Date: Tue, 26 Nov 2013 23:09:00 -0500 Subject: [PATCH] Bug 15572. Lookup KnownTypeCollection element types in MSSimpleNamespace This patch prevents the problem in https://bugzilla.xamarin.com/show_bug.cgi?id=15572. This change allows the DataContractSerializer to deserialize DataMembers that use an array KnownType, at least for the test case in the bug report. --- .../System.Runtime.Serialization/XmlFormatterDeserializer.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mcs/class/System.Runtime.Serialization/System.Runtime.Serialization/XmlFormatterDeserializer.cs b/mcs/class/System.Runtime.Serialization/System.Runtime.Serialization/XmlFormatterDeserializer.cs index b4eae19e8d8..52e5bc7bd07 100644 --- a/mcs/class/System.Runtime.Serialization/System.Runtime.Serialization/XmlFormatterDeserializer.cs +++ b/mcs/class/System.Runtime.Serialization/System.Runtime.Serialization/XmlFormatterDeserializer.cs @@ -261,7 +261,7 @@ namespace System.Runtime.Serialization if (name.StartsWith ("ArrayOf", StringComparison.Ordinal)) { name = name.Substring (7); // strip "ArrayOf" if (ns == KnownTypeCollection.MSArraysNamespace) - return GetTypeFromNamePair (name, String.Empty).MakeArrayType (); + return GetTypeFromNamePair (name, KnownTypeCollection.MSSimpleNamespace).MakeArrayType (); makeArray = true; } -- 2.25.1