nhtha
diff --git a/‎google-http-client/src/main/java/com/google/api/client/util/ArrayMap.java
Lines changed: 2 additions & 0 deletions b/‎google-http-client/src/main/java/com/google/api/client/util/ArrayMap.java
Lines changed: 2 additions & 0 deletions
diff --git a/‎google-http-client/src/test/java/com/google/api/client/util/ArrayMapTest.java
Lines changed: 51 additions & 0 deletions b/‎google-http-client/src/test/java/com/google/api/client/util/ArrayMapTest.java
Lines changed: 51 additions & 0 deletions
@@ -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;
     }
   }
 
@@ -16,6 +16,9 @@
 
 import junit.framework.TestCase;
 
+import java.util.Iterator;
+import java.util.Map;
+
 /**
  * Tests {@link ArrayMap}.
  *
@@ -109,4 +112,52 @@ public void testHashCode() {
 
     assertTrue(map.hashCode() > 0);
   }
+
+  public void testIteratorRemove1() {
+    ArrayMap<String, String> map = new ArrayMap<String, String>();
+    map.put("a", "a");
+    map.put("b", "b");
+    map.put("c", "c");
+    Iterator<Map.Entry<String, String>> iter = map.entrySet().iterator();
+    while (iter.hasNext()) {
+      Map.Entry<String, String> entry = iter.next();
+      if (!"all".equalsIgnoreCase(entry.getKey())) {
+        iter.remove();
+      }
+    }
+    assertEquals(0, map.size());
+  }
+
+  public void testIteratorRemove2() {
+    ArrayMap<String, String> map = new ArrayMap<String, String>();
+    map.put("a", "a");
+    map.put("b", "b");
+    map.put("c", "c");
+    Iterator<Map.Entry<String, String>> iter = map.entrySet().iterator();
+    while (iter.hasNext()) {
+      Map.Entry<String, String> entry = iter.next();
+      if ("b".equalsIgnoreCase(entry.getKey())) {
+        iter.remove();
+      }
+    }
+    assertEquals(2, map.size());
+    assertEquals("a", map.get("a"));
+    assertEquals("c", map.get("c"));
+  }
+
+  public void testIteratorRemove3() {
+    ArrayMap<String, String> map = new ArrayMap<String, String>();
+    map.put("a", "a");
+    map.put("b", "b");
+    map.put("c", "c");
+    Iterator<Map.Entry<String, String>> iter = map.entrySet().iterator();
+    while (iter.hasNext()) {
+      Map.Entry<String, String> entry = iter.next();
+      if (!"b".equalsIgnoreCase(entry.getKey())) {
+        iter.remove();
+      }
+    }
+    assertEquals(1, map.size());
+    assertEquals("b", map.get("b"));
+  }
 }
Original file line number	Diff line number	Diff line change
`@@ -381,6 +381,7 @@ public Map.Entry<K, V> next() {`
`381`	`381`	`throw new NoSuchElementException();`
`382`	`382`	`}`
`383`	`383`	`this.nextIndex++;`
	`384`	`+ this.removed = false;`
`384`	`385`	`return new Entry(index);`
`385`	`386`	`}`
`386`	`387`
`@@ -390,6 +391,7 @@ public void remove() {`
`390`	`391`	`throw new IllegalArgumentException();`
`391`	`392`	`}`
`392`	`393`	`ArrayMap.this.remove(index);`
	`394`	`+ this.nextIndex--;`
`393`	`395`	`this.removed = true;`
`394`	`396`	`}`
`395`	`397`	`}`