diff options
| author |  Adam Cozzette <acozzette@gmail.com> | 2018-05-25 15:26:18 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-05-25 15:26:18 -0700 |
| commit | edaaea01f69cb9927813a5fe55093b8faacebb97 (patch) | |
| tree | ea2c0cfe72f25c79e6bb0e0d7f8f4da320cc3c4a /src | |
| parent | 6f723a6624de0e0f9b1ae16ae002e678613e07b8 (diff) | |
| parent | d1af029104e9b594a99209484914b822addb08fa (diff) | |
Merge pull request #4687 from acozzette/js-map-parsing-fix
Fixed JS parsing of unspecified map keys
Diffstat (limited to 'src')
| -rwxr-xr-x | src/google/protobuf/compiler/js/js_generator.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/google/protobuf/compiler/js/js_generator.cc b/src/google/protobuf/compiler/js/js_generator.cc index d8282e40..b5771f26 100755 --- a/src/google/protobuf/compiler/js/js_generator.cc +++ b/src/google/protobuf/compiler/js/js_generator.cc @@ -2962,8 +2962,12 @@ void Generator::GenerateClassDeserializeBinaryField( if (value_field->type() == FieldDescriptor::TYPE_MESSAGE) { printer->Print(", $messageType$.deserializeBinaryFromReader", "messageType", GetMessagePath(options, value_field->message_type())); + } else { + printer->Print(", null"); } - + printer->Print(", $defaultKey$", + "defaultKey", JSFieldDefault(key_field) + ); printer->Print(");\n"); printer->Print(" });\n"); } else { |