am a76831c3: Merge "Fix how getRepeatedFieldArrayLength works"

* commit 'a76831c3629c3c1a9900984f3aea6306dbf0734c': Fix how getRepeatedFieldArrayLength works

am a76831c3: Merge "Fix how getRepeatedFieldArrayLength works"
* commit 'a76831c3629c3c1a9900984f3aea6306dbf0734c': Fix how getRepeatedFieldArrayLength works
4be139dc · Max Cai · Android Git Automerger · 33824b0f · ec0e1c00 · 4be139dc
Commit 4be139dc authored Aug 07, 2014 by Max Cai Committed by Android Git Automerger Aug 07, 2014
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 5 deletions

WireFormatNano.java ...rc/main/java/com/google/protobuf/nano/WireFormatNano.java +1 -5

No files found.
--- a/java/src/main/java/com/google/protobuf/nano/WireFormatNano.java
+++ b/java/src/main/java/com/google/protobuf/nano/WireFormatNano.java
@@ -113,11 +113,7 @@ public final class WireFormatNano {
    int arrayLength = 1;
    int startPos = input.getPosition();
    input.skipField(tag);
-    while (input.getBytesUntilLimit() > 0) {
-      int thisTag = input.readTag();
-      if (thisTag != tag) {
-        break;
-      }
+    while (input.readTag() == tag) {
      input.skipField(tag);
      arrayLength++;
    }