Imported Upstream version 4.6.0.182

Former-commit-id: 439c182e520038bf50777ca2fe684f216ae28552
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2016-09-01 10:46:18 +00:00
parent c911219690
commit 804b15604f
118 changed files with 1007 additions and 891 deletions

View File

@ -98,10 +98,10 @@ namespace System.ServiceModel.Channels
return OnGetBody<T> (GetReaderAtBodyContents ());
}
public T GetBody<T> (XmlObjectSerializer xmlFormatter)
public T GetBody<T> (XmlObjectSerializer serializer)
{
// FIXME: Somehow use OnGetBody() here as well?
return (T)xmlFormatter.ReadObject (GetReaderAtBodyContents ());
return (T)serializer.ReadObject (GetReaderAtBodyContents ());
}
protected virtual T OnGetBody<T> (XmlDictionaryReader reader)
@ -369,13 +369,13 @@ namespace System.ServiceModel.Channels
// 5)
public static Message CreateMessage (MessageVersion version,
string action, object body, XmlObjectSerializer xmlFormatter)
string action, object body, XmlObjectSerializer serializer)
{
return body == null ?
CreateMessage (version, action) :
CreateMessage (
version, action,
new XmlObjectSerializerBodyWriter (body, xmlFormatter));
new XmlObjectSerializerBodyWriter (body, serializer));
}
// 6)