diff options
| author | Wink Saville <wink@google.com> | 2014-03-22 01:09:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-03-22 01:09:34 +0000 |
| commit | dc2ab875690f8061ba1a712872133120792e4746 (patch) | |
| tree | af51cf533d0eb2be7f0727982d2d48b88aa0b8bd /src | |
| parent | ddc98d6dd0800d180454b40ac9cc80f61cc53c21 (diff) | |
| parent | b7dd7d929443b774afe8d15d32a05c33bc8ad889 (diff) | |
| download | protobuf-dc2ab875690f8061ba1a712872133120792e4746.tar.gz protobuf-dc2ab875690f8061ba1a712872133120792e4746.tar.bz2 protobuf-dc2ab875690f8061ba1a712872133120792e4746.zip | |
Merge "Revert "Don't reset cachedSize to 0 in getSerializedSize""
Diffstat (limited to 'src')
| -rw-r--r-- | src/google/protobuf/compiler/javanano/javanano_message.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/google/protobuf/compiler/javanano/javanano_message.cc b/src/google/protobuf/compiler/javanano/javanano_message.cc index 3a1b5a50..008bec26 100644 --- a/src/google/protobuf/compiler/javanano/javanano_message.cc +++ b/src/google/protobuf/compiler/javanano/javanano_message.cc @@ -304,8 +304,8 @@ GenerateMessageSerializationMethods(io::Printer* printer) { printer->Print( "\n" "@Override\n" - "protected int computeSerializedSize() {\n" - " int size = super.computeSerializedSize();\n"); + "public int getSerializedSize() {\n" + " int size = super.getSerializedSize();\n"); printer->Indent(); for (int i = 0; i < descriptor_->field_count(); i++) { @@ -314,6 +314,7 @@ GenerateMessageSerializationMethods(io::Printer* printer) { printer->Outdent(); printer->Print( + " cachedSize = size;\n" " return size;\n" "}\n"); } |