Imported Upstream version 4.0.1.28

Former-commit-id: 7bed21f7f097faf1b23b151908aba1976234cb6e
This commit is contained in:
Jo Shields
2015-05-15 09:04:39 +01:00
parent 7272927785
commit 2e0d90627e
155 changed files with 2071 additions and 1163 deletions

View File

@ -353,8 +353,7 @@ namespace System.Runtime.Serialization.Json
for (reader.MoveToContent (); reader.NodeType != XmlNodeType.EndElement; reader.MoveToContent ()) {
if (!reader.IsStartElement ("item"))
throw SerializationError (String.Format ("Expected element 'item', but found '{0}' in namespace '{1}'", reader.LocalName, reader.NamespaceURI));
Type et = elementType == typeof (object) || elementType.IsAbstract ? null : elementType;
object elem = ReadObject (et ?? typeof (object));
object elem = ReadObject (elementType);
c.Add (elem);
}
#if NET_2_1