diff options
author | Max Cai <maxtroy@google.com> | 2013-10-16 10:12:58 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-10-16 10:12:58 +0000 |
commit | afaf74ce55f4aff63dc30e7045a7cd6c1cf232dc (patch) | |
tree | 08e02cb00d3c80f193e51917fab0017b88093539 /src/google/protobuf/compiler/javanano/javanano_enum_field.cc | |
parent | 63e819adbb4d2d8215f5d3d8297dc50bf2fe3329 (diff) | |
parent | 334a7d1117a576bc6010c14677fb6444639c1dda (diff) | |
download | external_protobuf-afaf74ce55f4aff63dc30e7045a7cd6c1cf232dc.zip external_protobuf-afaf74ce55f4aff63dc30e7045a7cd6c1cf232dc.tar.gz external_protobuf-afaf74ce55f4aff63dc30e7045a7cd6c1cf232dc.tar.bz2 |
Merge "Fix repeated field merging semantics."
Diffstat (limited to 'src/google/protobuf/compiler/javanano/javanano_enum_field.cc')
-rw-r--r-- | src/google/protobuf/compiler/javanano/javanano_enum_field.cc | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/src/google/protobuf/compiler/javanano/javanano_enum_field.cc b/src/google/protobuf/compiler/javanano/javanano_enum_field.cc index cdb3d09..fe67d76 100644 --- a/src/google/protobuf/compiler/javanano/javanano_enum_field.cc +++ b/src/google/protobuf/compiler/javanano/javanano_enum_field.cc @@ -269,24 +269,32 @@ GenerateMergingCode(io::Printer* printer) const { " arrayLength++;\n" "}\n" "input.rewindToPosition(startPos);\n" - "this.$name$ = new $type$[arrayLength];\n" - "for (int i = 0; i < arrayLength; i++) {\n" - " this.$name$[i] = input.readInt32();\n" + "int i = this.$name$ == null ? 0 : this.$name$.length;\n" + "int[] newArray = new int[i + arrayLength];\n" + "if (i != 0) {\n" + " java.lang.System.arraycopy(this.$name$, 0, newArray, 0, i);\n" + "}\n" + "for (; i < newArray.length; i++) {\n" + " newArray[i] = input.readInt32();\n" "}\n" + "this.$name$ = newArray;\n" "input.popLimit(limit);\n"); } else { printer->Print(variables_, - "int arrayLength = com.google.protobuf.nano.WireFormatNano.getRepeatedFieldArrayLength(input, $tag$);\n" - "int i = this.$name$.length;\n" + "int arrayLength = com.google.protobuf.nano.WireFormatNano.\n" + " getRepeatedFieldArrayLength(input, $tag$);\n" + "int i = this.$name$ == null ? 0 : this.$name$.length;\n" "int[] newArray = new int[i + arrayLength];\n" - "System.arraycopy(this.$name$, 0, newArray, 0, i);\n" - "this.$name$ = newArray;\n" - "for (; i < this.$name$.length - 1; i++) {\n" - " this.$name$[i] = input.readInt32();\n" + "if (i != 0) {\n" + " java.lang.System.arraycopy(this.$name$, 0, newArray, 0, i);\n" + "}\n" + "for (; i < newArray.length - 1; i++) {\n" + " newArray[i] = input.readInt32();\n" " input.readTag();\n" "}\n" "// Last one without readTag.\n" - "this.$name$[i] = input.readInt32();\n"); + "newArray[i] = input.readInt32();\n" + "this.$name$ = newArray;\n"); } } |