Merge "Fix how getRepeatedFieldArrayLength works"

ec0e1c00 · Max Cai · Gerrit Code Review · a1742318 · 9ceb3d4a · ec0e1c00
Commit ec0e1c00 authored Aug 07, 2014 by Max Cai Committed by Gerrit Code Review Aug 05, 2014
Hide 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++;
    }