diff options
| author | Max Cai <maxtroy@google.com> | 2013-10-15 18:11:56 +0100 |
|---|---|---|
| committer | Max Cai <maxtroy@google.com> | 2013-10-15 18:11:56 +0100 |
| commit | 334a7d1117a576bc6010c14677fb6444639c1dda (patch) | |
| tree | 08e02cb00d3c80f193e51917fab0017b88093539 /java/pom.xml | |
| parent | 63e819adbb4d2d8215f5d3d8297dc50bf2fe3329 (diff) | |
| download | external_protobuf-334a7d1117a576bc6010c14677fb6444639c1dda.zip external_protobuf-334a7d1117a576bc6010c14677fb6444639c1dda.tar.gz external_protobuf-334a7d1117a576bc6010c14677fb6444639c1dda.tar.bz2 | |
Fix repeated field merging semantics.
The public doc states that repeated fields are simply concatenated
and doesn't impose a different semantics for packed fields. This
CL fixes this for packed fields and adds tests covering all cases.
Also fixed a bit of missed null-repeated-field treatments.
Change-Id: Ie35277bb1a9f0b8171dc9d07b6adf9b9d3308de2
Diffstat (limited to 'java/pom.xml')
| -rw-r--r-- | java/pom.xml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/java/pom.xml b/java/pom.xml index 1f43670..dcc1cfa 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -145,6 +145,7 @@ <arg value="../src/google/protobuf/unittest_multiple_nano.proto" /> <arg value="../src/google/protobuf/unittest_multiple_nameclash_nano.proto" /> <arg value="../src/google/protobuf/unittest_enum_class_nano.proto" /> + <arg value="../src/google/protobuf/unittest_repeated_merge_nano.proto" /> </exec> <exec executable="../src/protoc"> <arg value="--javanano_out=store_unknown_fields=true:target/generated-test-sources" /> |