From 2d849337400b64ee913ece4631d3b2dbc95f20d8 Mon Sep 17 00:00:00 2001
From: Wink Saville <wink@google.com>
Date: Fri, 21 Mar 2014 18:05:10 -0700
Subject: Revert "Don't reset cachedSize to 0 in getSerializedSize"

This reverts commit c6e12c6702ca764486f952654ba1568f00efe813.
---
 src/google/protobuf/compiler/javanano/javanano_message.cc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/google/protobuf/compiler/javanano/javanano_message.cc b/src/google/protobuf/compiler/javanano/javanano_message.cc
index 3a1b5a5..008bec2 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");
 }
-- 
cgit v1.1