diff options
| author | Atsushi Eno <atsushieno@gmail.com> | 2009-10-08 13:55:36 +0400 |
|---|---|---|
| committer | Atsushi Eno <atsushieno@gmail.com> | 2009-10-08 13:55:36 +0400 |
| commit | ae41bed33879f2a85830220aaf7ffac3ea20472a (patch) | |
| tree | 3771823fc412481b44e27152ee4ea4b9b4287e2d /mcs/class/System.ServiceModel.Web/System.ServiceModel.Dispatcher/WebMessageFormatter.cs | |
| parent | cd263cb1f496adb927884bbc5b5a56a4e9124d8a (diff) | |
2009-10-08 Atsushi Enomoto <atsushi@ximian.com>
* DataContractJsonSerializer.cs, JsonSerializationWriter.cs:
alwaysEmitTypeInformation is false by default. It is for __type
attribute, not for type attribute. __type name is always with ":#".
* TypeMap.cs : sort members in default typemap (it is ordered).
Uncomment EmitDefaultValue.
* JsonWriter.cs : handle "null" string (it is somewhat messy).
* WebMessageEncoder.cs : use alwaysEmitTypeInformation to output
object __type.
* DataContractJsonSerializerTest.cs : added test for
alwaysEmitTypeInformation argument.
svn path=/trunk/mcs/; revision=143748
Diffstat (limited to 'mcs/class/System.ServiceModel.Web/System.ServiceModel.Dispatcher/WebMessageFormatter.cs')
| -rw-r--r-- | mcs/class/System.ServiceModel.Web/System.ServiceModel.Dispatcher/WebMessageFormatter.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mcs/class/System.ServiceModel.Web/System.ServiceModel.Dispatcher/WebMessageFormatter.cs b/mcs/class/System.ServiceModel.Web/System.ServiceModel.Dispatcher/WebMessageFormatter.cs index 90a49d4de18..d1f789651dd 100644 --- a/mcs/class/System.ServiceModel.Web/System.ServiceModel.Dispatcher/WebMessageFormatter.cs +++ b/mcs/class/System.ServiceModel.Web/System.ServiceModel.Dispatcher/WebMessageFormatter.cs @@ -156,8 +156,9 @@ namespace System.ServiceModel.Description return GetSerializer (ref xml_serializer, p => new DataContractSerializer (p.Type)); break; case WebContentFormat.Json: + // FIXME: after name argument they are hack if (IsResponseBodyWrapped) - return GetSerializer (ref json_serializer, p => new DataContractJsonSerializer (p.Type, BodyName ?? p.Name)); + return GetSerializer (ref json_serializer, p => new DataContractJsonSerializer (p.Type, BodyName ?? p.Name, null, 0x100000, false, null, true)); else return GetSerializer (ref json_serializer, p => new DataContractJsonSerializer (p.Type)); break; |