Imported Upstream version 4.0.1.28

Former-commit-id: d8405b75d12c6845dab8fe08c1576f57a148d621
This commit is contained in:
Xamarin Public Jenkins
2015-05-14 10:55:10 -04:00
parent 7272927785
commit daac4dedd2
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