diff options
| author |  Adam Cozzette <acozzette@google.com> | 2017-04-27 14:55:53 -0700 |
|---|---|---|
| committer | Adam Cozzette <acozzette@google.com> | 2017-04-27 14:55:53 -0700 |
| commit | 9053033a5076f82cf18b823c31f352e95e5bfd8d (patch) | |
| tree | 1d2a2611f56e786d7c3e40b8fd1b2e3d9aff9025 /java/core/src/main/java/com/google/protobuf/TextFormat.java | |
| parent | 067b1eec3bf852abaad0844999461baff8a5fdc8 (diff) | |
| parent | a6189acd18b00611c1dc7042299ad75486f08a1a (diff) | |
Merge remote-tracking branch 'remotes/google/3.3.x' into merge-3.3-to-master
Diffstat (limited to 'java/core/src/main/java/com/google/protobuf/TextFormat.java')
| -rw-r--r-- | java/core/src/main/java/com/google/protobuf/TextFormat.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/java/core/src/main/java/com/google/protobuf/TextFormat.java b/java/core/src/main/java/com/google/protobuf/TextFormat.java index 49708242..53dead80 100644 --- a/java/core/src/main/java/com/google/protobuf/TextFormat.java +++ b/java/core/src/main/java/com/google/protobuf/TextFormat.java @@ -1442,7 +1442,7 @@ public final class TextFormat { /** * Parse a single field from {@code tokenizer} and merge it into - * {@code builder}. + * {@code target}. */ private void mergeField(final Tokenizer tokenizer, final ExtensionRegistry extensionRegistry, @@ -1712,6 +1712,8 @@ public final class TextFormat { } if (field.isRepeated()) { + // TODO(b/29122459): If field.isMapField() and FORBID_SINGULAR_OVERWRITES mode, + // check for duplicate map keys here. target.addRepeatedField(field, value); } else if ((singularOverwritePolicy == SingularOverwritePolicy.FORBID_SINGULAR_OVERWRITES) |