diff options
| author | Dave Hawkey <dhawkey@google.com> | 2014-03-20 10:55:41 -0600 |
|---|---|---|
| committer | Dave Hawkey <dhawkey@google.com> | 2014-04-10 08:21:44 -0600 |
| commit | c82101204dcde798f870d95e91f5483c3e57eb29 (patch) | |
| tree | 377a25f535ffb0e37a1762f2d3b7b1ca83a4ece1 /src | |
| parent | ce2f59915e0b41c935e3f72a2b7b71b6c19b6860 (diff) | |
| download | external_protobuf-c82101204dcde798f870d95e91f5483c3e57eb29.zip external_protobuf-c82101204dcde798f870d95e91f5483c3e57eb29.tar.gz external_protobuf-c82101204dcde798f870d95e91f5483c3e57eb29.tar.bz2 | |
Don't reset cachedSize to 0 in getSerializedSize
This avoids a race-condition when cachedSize is momentarily set to 0
for non-empty messages if multiple threads call getSerializedSize
(e.g. during serialization).
This is a retry of https://android-review.googlesource.com/#/c/88570/.
getSerializedSize() has been kept non-final so that messages generated
with a previous version of the compiler will not break.
Change-Id: I8d8154a10938cde579ae19c55eae55b1e70e0bda
Diffstat (limited to 'src')
| -rw-r--r-- | src/google/protobuf/compiler/javanano/javanano_message.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/google/protobuf/compiler/javanano/javanano_message.cc b/src/google/protobuf/compiler/javanano/javanano_message.cc index 008bec2..3a1b5a5 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" - "public int getSerializedSize() {\n" - " int size = super.getSerializedSize();\n"); + "protected int computeSerializedSize() {\n" + " int size = super.computeSerializedSize();\n"); printer->Indent(); for (int i = 0; i < descriptor_->field_count(); i++) { @@ -314,7 +314,6 @@ GenerateMessageSerializationMethods(io::Printer* printer) { printer->Outdent(); printer->Print( - " cachedSize = size;\n" " return size;\n" "}\n"); } |