diff options
| author | alien <the-alien@live.ru> | 2016-03-29 20:56:32 +0300 |
|---|---|---|
| committer | alien <the-alien@live.ru> | 2016-03-29 20:56:32 +0300 |
| commit | 6f8dd2115b3ed07819a48dfa78b15770dfa2c450 (patch) | |
| tree | 2c71285c5f435c337114d5b8c0c0d6b2ecd302db /csharp/src/Google.Protobuf/Reflection/FieldDescriptor.cs | |
| parent | 0d32ab37fa94134427478d6776108e7cdb3e5e15 (diff) | |
| download | protobuf-6f8dd2115b3ed07819a48dfa78b15770dfa2c450.tar.gz protobuf-6f8dd2115b3ed07819a48dfa78b15770dfa2c450.tar.bz2 protobuf-6f8dd2115b3ed07819a48dfa78b15770dfa2c450.zip | |
Code review fixes
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 8cfdb779..6083f171 100644 --- a/csharp/src/Google.Protobuf/Reflection/FieldDescriptor.cs +++ b/csharp/src/Google.Protobuf/Reflection/FieldDescriptor.cs @@ -94,7 +94,7 @@ namespace Google.Protobuf.Reflection /// <summary> /// The json_name option of the descriptor's target. /// </summary> - public string JsonName { get { return proto.JsonName; } } + public string JsonName { get { return proto.JsonName == "" ? JsonFormatter.ToCamelCase(proto.Name) : proto.JsonName; } } internal FieldDescriptorProto Proto { get { return proto; } } |