diff options
author | Jon Skeet <skeet@pobox.com> | 2016-03-30 09:11:59 +0100 |
---|---|---|
committer | Jon Skeet <skeet@pobox.com> | 2016-03-30 09:11:59 +0100 |
commit | 261fde17072075eb69be1acdd58f4a97986465e0 (patch) | |
tree | e946d75326662d0e2f72a4379de098fa61c25705 /csharp/src/Google.Protobuf/JsonFormatter.cs | |
parent | 261ee021f640ea6fe67aaf1f53e1518ed154cad0 (diff) | |
parent | af34538aca9d91b86826223624018a69370caa1d (diff) | |
download | protobuf-261fde17072075eb69be1acdd58f4a97986465e0.tar.gz protobuf-261fde17072075eb69be1acdd58f4a97986465e0.tar.bz2 protobuf-261fde17072075eb69be1acdd58f4a97986465e0.zip |
Merge pull request #1326 from the-alien/csharp_json_name
csharp: add support for the json_name option
Diffstat (limited to 'csharp/src/Google.Protobuf/JsonFormatter.cs')
-rw-r--r-- | csharp/src/Google.Protobuf/JsonFormatter.cs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/csharp/src/Google.Protobuf/JsonFormatter.cs b/csharp/src/Google.Protobuf/JsonFormatter.cs index eb959c9f..cbd9366c 100644 --- a/csharp/src/Google.Protobuf/JsonFormatter.cs +++ b/csharp/src/Google.Protobuf/JsonFormatter.cs @@ -237,11 +237,13 @@ namespace Google.Protobuf { writer.Write(PropertySeparator); } - WriteString(writer, ToCamelCase(accessor.Descriptor.Name)); + + WriteString(writer, accessor.Descriptor.JsonName); writer.Write(NameValueSeparator); WriteValue(writer, value); + first = false; - } + } return !first; } |