diff options
| author |  Brian Duff <bduff@google.com> | 2015-01-09 13:32:38 -0800 |
|---|---|---|
| committer | Brian Duff <bduff@google.com> | 2015-04-28 12:28:05 -0700 |
| commit | fb96026b8deb79aa023c9f5c460582e8fea8f331 (patch) | |
| tree | 45d106b89a44546c57846c0174764c0c367a0ab0 /javanano/pom.xml | |
| parent | 9ffaa50d55bf377f4693eae45483e26ca136f878 (diff) | |
When no clear() is generated, still initialize fields.
https://android-review.googlesource.com/#/c/67890/ removed field
initialization from the ctor, making it just call clear() instead.
When I added the generate_clear option back (as part of the reftypes
compat mode) in https://android-review.googlesource.com/#/c/109530/,
I forgot to ensure that what clear() used to do was inlined in the
constructor.
This change fixes NPEs that are happening for users of
reftypes_compat_mode who rely on unset repeated fields being empty
arrays rather than null.
Change-Id: Idb58746c60f4a4054b7ebb5c3b0e76b16ff88184
Diffstat (limited to 'javanano/pom.xml')
| -rw-r--r-- | javanano/pom.xml | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/javanano/pom.xml b/javanano/pom.xml index 7a2be9df..64ed4372 100644 --- a/javanano/pom.xml +++ b/javanano/pom.xml @@ -139,6 +139,15 @@ <arg value="--proto_path=src/test/java/com" /> <arg value="src/test/java/com/google/protobuf/nano/unittest_reference_types_nano.proto" /> </exec> + <exec executable="../src/protoc"> + <arg value="--javanano_out= + optional_field_style=reftypes_compat_mode, + generate_equals=true, + java_outer_classname=google/protobuf/nano/unittest_reference_types_nano.proto|NanoReferenceTypesCompat + :target/generated-test-sources" /> + <arg value="--proto_path=src/test/java/com" /> + <arg value="src/test/java/com/google/protobuf/nano/unittest_reference_types_nano.proto" /> + </exec> </tasks> <testSourceRoot>target/generated-test-sources</testSourceRoot> </configuration> |