Revert "Fixed JS parsing of default map values (#6394)" (#6468)

This reverts commit dcc8ffd9c6.
pull/6481/head
Paul Yang 6 years ago committed by GitHub
parent 0c4b607e98
commit a450e13a95
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 8
      js/map.js
  2. 1
      src/google/protobuf/compiler/js/js_generator.cc

@ -465,15 +465,11 @@ jspb.Map.prototype.serializeBinary = function(
* entries with unset keys is required for maps to be backwards compatible
* with the repeated message representation described here: goo.gl/zuoLAC
*
* @param {V=} opt_defaultValue
* The default value for the type of map values.
*
*/
jspb.Map.deserializeBinary = function(map, reader, keyReaderFn, valueReaderFn,
opt_valueReaderCallback, opt_defaultKey,
opt_defaultValue) {
opt_valueReaderCallback, opt_defaultKey) {
var key = opt_defaultKey;
var value = opt_defaultValue;
var value = undefined;
while (reader.nextField()) {
if (reader.isEndGroup()) {

@ -3142,7 +3142,6 @@ void Generator::GenerateClassDeserializeBinaryField(
printer->Print(", null");
}
printer->Print(", $defaultKey$", "defaultKey", JSFieldDefault(key_field));
printer->Print(", $defaultValue$", "defaultValue", JSFieldDefault(value_field));
printer->Print(");\n");
printer->Print(" });\n");
} else {

Loading…
Cancel
Save