ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/main/java/util/Vector.java
(Generate patch)

Comparing jsr166/src/main/java/util/Vector.java (file contents):
Revision 1.35 by jsr166, Sun Nov 13 21:07:40 2016 UTC vs.
Revision 1.36 by jsr166, Mon Nov 14 22:46:22 2016 UTC

# Line 1006 | Line 1006 | public class Vector<E>
1006          int expectedModCount = modCount;
1007          final Object[] es = elementData;
1008          final int end = elementCount;
1009        final boolean modified;
1009          int i;
1010          // Optimize for initial run of survivors
1011          for (i = 0; i < end && !filter.test(elementAt(es, i)); i++)
# Line 1014 | Line 1013 | public class Vector<E>
1013          // Tolerate predicates that reentrantly access the collection for
1014          // read (but writers still get CME), so traverse once to find
1015          // elements to delete, a second pass to physically expunge.
1016 <        if (modified = (i < end)) {
1018 <            expectedModCount++;
1019 <            modCount++;
1016 >        if (i < end) {
1017              final int beg = i;
1018              final long[] deathRow = nBits(end - beg);
1019              deathRow[0] = 1L;   // set bit 0
1020              for (i = beg + 1; i < end; i++)
1021                  if (filter.test(elementAt(es, i)))
1022                      setBit(deathRow, i - beg);
1023 +            if (modCount != expectedModCount)
1024 +                throw new ConcurrentModificationException();
1025 +            expectedModCount++;
1026 +            modCount++;
1027              int w = beg;
1028              for (i = beg; i < end; i++)
1029                  if (isClear(deathRow, i - beg))
1030                      es[w++] = es[i];
1031              Arrays.fill(es, elementCount = w, end, null);
1032 +            // checkInvariants();
1033 +            return true;
1034 +        } else {
1035 +            if (modCount != expectedModCount)
1036 +                throw new ConcurrentModificationException();
1037 +            // checkInvariants();
1038 +            return false;
1039          }
1032        if (modCount != expectedModCount)
1033            throw new ConcurrentModificationException();
1034        // checkInvariants();
1035        return modified;
1040      }
1041  
1042      /**

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines