Cherrypick googleapis#371.

mattwhisenhunt · Mar 15, 2018 · f87f668 · f87f668
1 parent acfc41a
commit f87f668
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/google-http-client/src/main/java/com/google/api/client/util/ArrayMap.java b/google-http-client/src/main/java/com/google/api/client/util/ArrayMap.java
@@ -381,6 +381,7 @@ public Map.Entry<K, V> next() {
         throw new NoSuchElementException();
       }
       this.nextIndex++;
+      this.removed = false;
       return new Entry(index);
     }
 
@@ -390,6 +391,7 @@ public void remove() {
         throw new IllegalArgumentException();
       }
       ArrayMap.this.remove(index);
+      this.nextIndex--;
       this.removed = true;
     }
   }