--- jsr166/src/main/java/util/ArrayList.java 2019/08/30 18:05:39 1.69 +++ jsr166/src/main/java/util/ArrayList.java 2020/01/10 21:32:08 1.70 @@ -1139,7 +1139,7 @@ public class ArrayList extends Abstra this.parent = parent; this.offset = parent.offset + fromIndex; this.size = toIndex - fromIndex; - this.modCount = root.modCount; + this.modCount = parent.modCount; } public E set(int index, E element) { @@ -1292,7 +1292,7 @@ public class ArrayList extends Abstra return new ListIterator() { int cursor = index; int lastRet = -1; - int expectedModCount = root.modCount; + int expectedModCount = SubList.this.modCount; public boolean hasNext() { return cursor != SubList.this.size; @@ -1336,7 +1336,7 @@ public class ArrayList extends Abstra final Object[] es = root.elementData; if (offset + i >= es.length) throw new ConcurrentModificationException(); - for (; i < size && modCount == expectedModCount; i++) + for (; i < size && root.modCount == expectedModCount; i++) action.accept(elementAt(es, offset + i)); // update once at end to reduce heap write traffic cursor = i; @@ -1362,7 +1362,7 @@ public class ArrayList extends Abstra SubList.this.remove(lastRet); cursor = lastRet; lastRet = -1; - expectedModCount = root.modCount; + expectedModCount = SubList.this.modCount; } catch (IndexOutOfBoundsException ex) { throw new ConcurrentModificationException(); } @@ -1388,7 +1388,7 @@ public class ArrayList extends Abstra SubList.this.add(i, e); cursor = i + 1; lastRet = -1; - expectedModCount = root.modCount; + expectedModCount = SubList.this.modCount; } catch (IndexOutOfBoundsException ex) { throw new ConcurrentModificationException(); }