diff options
| author |  Feng Xiao <xfxyjwf@gmail.com> | 2015-08-11 15:07:12 -0700 |
|---|---|---|
| committer | Feng Xiao <xfxyjwf@gmail.com> | 2015-08-11 17:19:54 -0700 |
| commit | bd11198f694a2cb1544992bb7868198b1e9dfe6c (patch) | |
| tree | 3335f17b58d66091025f6407e16ea1708170f26f /src/google/protobuf/util/internal/protostream_objectwriter.cc | |
| parent | edaefac5d2221ab26b9988fb76c79760c6495fb8 (diff) | |
Fix map fields parsing.
Change-Id: If61e16cea84492474a71bbfe985131ec980b0b0a
Diffstat (limited to 'src/google/protobuf/util/internal/protostream_objectwriter.cc')
| -rw-r--r-- | src/google/protobuf/util/internal/protostream_objectwriter.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/google/protobuf/util/internal/protostream_objectwriter.cc b/src/google/protobuf/util/internal/protostream_objectwriter.cc index f9ddbf32..7f6f3c35 100644 --- a/src/google/protobuf/util/internal/protostream_objectwriter.cc +++ b/src/google/protobuf/util/internal/protostream_objectwriter.cc @@ -1541,8 +1541,10 @@ bool ProtoStreamObjectWriter::IsMap(const google::protobuf::Field& field) { const google::protobuf::Type* field_type = typeinfo_->GetType(field.type_url()); + // TODO(xiaofeng): Unify option names. return GetBoolOptionOrDefault(field_type->options(), - "google.protobuf.MessageOptions.map_entry", false); + "google.protobuf.MessageOptions.map_entry", false) || + GetBoolOptionOrDefault(field_type->options(), "map_entry", false); } void ProtoStreamObjectWriter::WriteTag(const google::protobuf::Field& field) { |