summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Duff <bduff@google.com>2015-01-22 02:30:29 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-01-22 02:30:29 +0000
commitbb2b6d9bb01780ba28a0b9c42758468929a6c002 (patch)
treea519c8ddbb21af6ea2ede4b3f35f68ba08821f23
parent0fba86c685b6fd8b82055541012c1ab1efc370cd (diff)
parent1c2c4706c4995122bb1271618511b27e84a9326a (diff)
downloadexternal_protobuf-bb2b6d9bb01780ba28a0b9c42758468929a6c002.zip
external_protobuf-bb2b6d9bb01780ba28a0b9c42758468929a6c002.tar.gz
external_protobuf-bb2b6d9bb01780ba28a0b9c42758468929a6c002.tar.bz2
am 1c2c4706: Merge "Exclude cachedSize when printing fields."
* commit '1c2c4706c4995122bb1271618511b27e84a9326a': Exclude cachedSize when printing fields.
-rw-r--r--java/src/main/java/com/google/protobuf/nano/MessageNanoPrinter.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/java/src/main/java/com/google/protobuf/nano/MessageNanoPrinter.java b/java/src/main/java/com/google/protobuf/nano/MessageNanoPrinter.java
index 4cca3d5..a30f2f3 100644
--- a/java/src/main/java/com/google/protobuf/nano/MessageNanoPrinter.java
+++ b/java/src/main/java/com/google/protobuf/nano/MessageNanoPrinter.java
@@ -108,6 +108,10 @@ public final class MessageNanoPrinter {
for (Field field : clazz.getFields()) {
int modifiers = field.getModifiers();
String fieldName = field.getName();
+ if ("cachedSize".equals(fieldName)) {
+ // TODO(bduff): perhaps cachedSize should have a more obscure name.
+ continue;
+ }
if ((modifiers & Modifier.PUBLIC) == Modifier.PUBLIC
&& (modifiers & Modifier.STATIC) != Modifier.STATIC