aboutsummaryrefslogtreecommitdiff
path: root/csharp/src/Google.Protobuf/JsonFormatter.cs
diff options
context:
space:
mode:
authoralien <the-alien@live.ru>2016-03-29 20:56:32 +0300
committeralien <the-alien@live.ru>2016-03-29 20:56:32 +0300
commit6f8dd2115b3ed07819a48dfa78b15770dfa2c450 (patch)
tree2c71285c5f435c337114d5b8c0c0d6b2ecd302db /csharp/src/Google.Protobuf/JsonFormatter.cs
parent0d32ab37fa94134427478d6776108e7cdb3e5e15 (diff)
downloadprotobuf-6f8dd2115b3ed07819a48dfa78b15770dfa2c450.tar.gz
protobuf-6f8dd2115b3ed07819a48dfa78b15770dfa2c450.tar.bz2
protobuf-6f8dd2115b3ed07819a48dfa78b15770dfa2c450.zip
Code review fixes
Diffstat (limited to 'csharp/src/Google.Protobuf/JsonFormatter.cs')
-rw-r--r--csharp/src/Google.Protobuf/JsonFormatter.cs3
1 files changed, 1 insertions, 2 deletions
diff --git a/csharp/src/Google.Protobuf/JsonFormatter.cs b/csharp/src/Google.Protobuf/JsonFormatter.cs
index 1b5349e9..cbd9366c 100644
--- a/csharp/src/Google.Protobuf/JsonFormatter.cs
+++ b/csharp/src/Google.Protobuf/JsonFormatter.cs
@@ -238,8 +238,7 @@ namespace Google.Protobuf
writer.Write(PropertySeparator);
}
- WriteString(writer, string.IsNullOrEmpty(accessor.Descriptor.JsonName) ?
- ToCamelCase(accessor.Descriptor.Name) : accessor.Descriptor.JsonName);
+ WriteString(writer, accessor.Descriptor.JsonName);
writer.Write(NameValueSeparator);
WriteValue(writer, value);