diff options
| author | Adam Cozzette <acozzette@google.com> | 2016-11-17 17:04:30 -0800 |
|---|---|---|
| committer | Adam Cozzette <acozzette@google.com> | 2016-11-17 17:04:30 -0800 |
| commit | 5d63097fc2b7f405f53d6ca4ad3c1ebd98d80ddd (patch) | |
| tree | 50d8116271f024e16334785464c794da85f3ce12 /csharp/src/Google.Protobuf/Reflection/FieldDescriptor.cs | |
| parent | 5a76e633ea9b5adb215e93fdc11e1c0c08b3fc74 (diff) | |
| parent | cd315dcbadc02569e145bde16e3f66c2fbb08e31 (diff) | |
| download | protobuf-5d63097fc2b7f405f53d6ca4ad3c1ebd98d80ddd.tar.gz protobuf-5d63097fc2b7f405f53d6ca4ad3c1ebd98d80ddd.tar.bz2 protobuf-5d63097fc2b7f405f53d6ca4ad3c1ebd98d80ddd.zip | |
Merge branch 'master' into down-integrate-with-msvc-fix
Diffstat (limited to 'csharp/src/Google.Protobuf/Reflection/FieldDescriptor.cs')
| -rw-r--r-- | csharp/src/Google.Protobuf/Reflection/FieldDescriptor.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/csharp/src/Google.Protobuf/Reflection/FieldDescriptor.cs b/csharp/src/Google.Protobuf/Reflection/FieldDescriptor.cs index 6c6f6ee0..ed15d0e1 100644 --- a/csharp/src/Google.Protobuf/Reflection/FieldDescriptor.cs +++ b/csharp/src/Google.Protobuf/Reflection/FieldDescriptor.cs @@ -97,7 +97,7 @@ namespace Google.Protobuf.Reflection // We could trust the generated code and check whether the type of the property is // a MapField, but that feels a tad nasty. this.propertyName = propertyName; - JsonName = Proto.JsonName == "" ? JsonFormatter.ToCamelCase(Proto.Name) : Proto.JsonName; + JsonName = Proto.JsonName == "" ? JsonFormatter.ToJsonName(Proto.Name) : Proto.JsonName; } |