mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 4.8.0.309

Browse Source 
Former-commit-id: 5f9c6ae75f295e057a7d2971f3a6df4656fa8850
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2016-11-10 13:04:39 +00:00
parent ee1447783b
commit 94b2861243
4912 changed files with 390737 additions and 49310 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/BaseMessagesFormatter.cs
View File

@ -243,7 +243,7 @@ namespace System.ServiceModel.Dispatcher
var headers = MessageToHeaderObjects (md, message);
object [] parts = MessageToParts (md, message);
if (md.MessageType != null) {
#if NET_2_1
#if MOBILE
parameters [0] = Activator.CreateInstance (md.MessageType);
#else
parameters [0] = Activator.CreateInstance (md.MessageType, true);
@ -271,7 +271,7 @@ namespace System.ServiceModel.Dispatcher
var headers = MessageToHeaderObjects (md, message);
object [] parts = MessageToParts (md, message);
if (md.MessageType != null) {
#if NET_2_1
#if MOBILE
object msgObject = Activator.CreateInstance (md.MessageType);
#else
object msgObject = Activator.CreateInstance (md.MessageType, true);
@ -355,14 +355,14 @@ namespace System.ServiceModel.Dispatcher
class DataContractMessagesFormatter : BaseMessagesFormatter
{
DataContractFormatAttribute attr;
#if !NET_2_1
#if !MOBILE
DataContractSerializerOperationBehavior serializerBehavior;
#endif
public DataContractMessagesFormatter (OperationDescription desc, DataContractFormatAttribute attr)
: base (desc)
{
#if !NET_2_1
#if !MOBILE
this.serializerBehavior = desc.Behaviors.Find<DataContractSerializerOperationBehavior>();
#endif
this.attr = attr;
@ -442,7 +442,7 @@ namespace System.ServiceModel.Dispatcher
XmlObjectSerializer GetSerializer (MessagePartDescription partDesc)
{
if (!serializers.ContainsKey (partDesc))
#if !NET_2_1
#if !MOBILE
if (serializerBehavior != null)
serializers [partDesc] = serializerBehavior.CreateSerializer(
partDesc.Type, partDesc.Name, partDesc.Namespace, OperationKnownTypes as IList<Type>);