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

Imported Upstream version 4.0.0~alpha1

Browse Source 
Former-commit-id: 806294f5ded97629b74c85c09952f2a74fe182d9
This commit is contained in:
Jo Shields
2015-04-07 09:35:12 +01:00
parent 283343f570
commit 3c1f479b9d
22469 changed files with 2931443 additions and 869343 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mcs/class/System.ServiceModel.Web/System.ServiceModel.Dispatcher/WebMessageFormatter.cs
View File

@ -472,6 +472,7 @@ namespace System.ServiceModel.Dispatcher
void WriteObject (XmlObjectSerializer serializer, XmlDictionaryWriter writer, object value)
{
if (serializer != null){
#if NET_2_1
if (serializer is DataContractJsonSerializer)
((DataContractJsonSerializer) serializer).WriteObject (writer, value);
@ -480,6 +481,7 @@ namespace System.ServiceModel.Dispatcher
#else
serializer.WriteObject (writer, value);
#endif
}
}
}
@ -642,16 +644,7 @@ namespace System.ServiceModel.Dispatcher
var ms = Stream as MemoryStream;
if (ms == null) {
ms = new MemoryStream ();
#if NET_4_0
Stream.CopyTo (ms);
#else
byte [] tmp = new byte [0x1000];
int size;
do {
size = Stream.Read (tmp, 0, tmp.Length);
ms.Write (tmp, 0, size);
} while (size > 0);
#endif
this.Stream = ms;
}
return new RawMessageBuffer (ms.ToArray (), headers, properties);