Merge "Fix regression in Vector.listIterator.add() introduced in N." am: 77f9daf710
am: 92608bb99d
Change-Id: Ibd1ac5b8189be210d88df4377939d88ea4c9d784
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/VectorTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/VectorTest.java
index a9f64a2..a16c4e4 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/VectorTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/VectorTest.java
@@ -30,6 +30,7 @@
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
+import java.util.ListIterator;
import java.util.NoSuchElementException;
import java.util.Spliterator;
import java.util.Vector;
@@ -850,6 +851,15 @@
}
}
+ // http://b/30974375
+ public void test_listIterator_addAndPrevious() {
+ ListIterator<String> it = new Vector<String>().listIterator();
+ assertFalse(it.hasNext());
+ it.add("value");
+ assertEquals("value", it.previous());
+ assertTrue(it.hasNext());
+ }
+
/**
* java.util.Vector#remove(int)
*/
diff --git a/ojluni/src/main/java/java/util/Vector.java b/ojluni/src/main/java/java/util/Vector.java
index e182471..e15c239 100644
--- a/ojluni/src/main/java/java/util/Vector.java
+++ b/ojluni/src/main/java/java/util/Vector.java
@@ -1241,6 +1241,7 @@
checkForComodification();
Vector.this.add(i, e);
expectedModCount = modCount;
+ limit++;
}
cursor = i + 1;
lastRet = -1;