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 | 598087ef53c22ae3fd22f87d20d00bea2c16e949 (patch) | |
tree | 1501b441be329d4d550cf2601f1a8c65537d3b43 /src/google | |
parent | dc2ab875690f8061ba1a712872133120792e4746 (diff) | |
download | protobuf-598087ef53c22ae3fd22f87d20d00bea2c16e949.tar.gz protobuf-598087ef53c22ae3fd22f87d20d00bea2c16e949.tar.bz2 protobuf-598087ef53c22ae3fd22f87d20d00bea2c16e949.zip |
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/google')
-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 008bec26..3a1b5a50 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"); } |