--- jsr166/src/main/java/util/ArrayList.java 2016/11/04 03:09:27 1.37 +++ jsr166/src/main/java/util/ArrayList.java 2016/11/12 20:51:59 1.38 @@ -746,9 +746,8 @@ public class ArrayList extends Abstra final boolean modified; int r; // Optimize for initial run of survivors - for (r = 0; r < size; r++) - if (c.contains(es[r]) != complement) - break; + for (r = 0; r < size && c.contains(es[r]) == complement; r++) + ; if (modified = (r < size)) { int w = r++; try { @@ -1503,9 +1502,8 @@ public class ArrayList extends Abstra final boolean modified; int r; // Optimize for initial run of survivors - for (r = 0; r < size; r++) - if (filter.test((E) es[r])) - break; + for (r = 0; r < size && !filter.test((E) es[r]); r++) + ; if (modified = (r < size)) { expectedModCount++; modCount++;