diff options
Diffstat (limited to 'src/google/protobuf/compiler/javanano/javanano_message_field.cc')
| -rw-r--r-- | src/google/protobuf/compiler/javanano/javanano_message_field.cc | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/src/google/protobuf/compiler/javanano/javanano_message_field.cc b/src/google/protobuf/compiler/javanano/javanano_message_field.cc index 277eb4e..04f1c14 100644 --- a/src/google/protobuf/compiler/javanano/javanano_message_field.cc +++ b/src/google/protobuf/compiler/javanano/javanano_message_field.cc @@ -233,9 +233,11 @@ GenerateMergingCode(io::Printer* printer) const { printer->Print(variables_, "int arrayLength = com.google.protobuf.nano.WireFormatNano" " .getRepeatedFieldArrayLength(input, $tag$);\n" - "int i = this.$name$.length;\n" + "int i = this.$name$ == null ? 0 : this.$name$.length;\n" "$type$[] newArray = new $type$[i + arrayLength];\n" - "System.arraycopy(this.$name$, 0, newArray, 0, i);\n" + "if (this.$name$ != null) {\n" + " System.arraycopy(this.$name$, 0, newArray, 0, i);\n" + "}\n" "this.$name$ = newArray;\n" "for (; i < this.$name$.length - 1; i++) {\n" " this.$name$[i] = new $type$();\n"); @@ -266,17 +268,21 @@ GenerateMergingCode(io::Printer* printer) const { void RepeatedMessageFieldGenerator:: GenerateSerializationCode(io::Printer* printer) const { printer->Print(variables_, - "for ($type$ element : this.$name$) {\n" - " output.write$group_or_message$($number$, element);\n" + "if (this.$name$ != null) {\n" + " for ($type$ element : this.$name$) {\n" + " output.write$group_or_message$($number$, element);\n" + " }\n" "}\n"); } void RepeatedMessageFieldGenerator:: GenerateSerializedSizeCode(io::Printer* printer) const { printer->Print(variables_, - "for ($type$ element : this.$name$) {\n" - " size += com.google.protobuf.nano.CodedOutputByteBufferNano\n" - " .compute$group_or_message$Size($number$, element);\n" + "if (this.$name$ != null) {\n" + " for ($type$ element : this.$name$) {\n" + " size += com.google.protobuf.nano.CodedOutputByteBufferNano\n" + " .compute$group_or_message$Size($number$, element);\n" + " }\n" "}\n"); } |