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.39 by jsr166, Fri Dec 2 06:38:56 2016 UTC vs.
Revision 1.40 by jsr166, Mon Dec 5 00:08:01 2016 UTC

# Line 306 | Line 306 | public class Vector<E>
306          modCount++;
307          if (newSize > elementData.length)
308              grow(newSize);
309 <        for (int i = newSize; i < elementCount; i++)
310 <            elementData[i] = null;
311 <        elementCount = newSize;
309 >        final Object[] es = elementData;
310 >        for (int to = elementCount, i = elementCount = newSize; i < to; i++)
311 >            es[i] = null;
312      }
313  
314      /**
# Line 676 | Line 676 | public class Vector<E>
676       * method (which is part of the {@link List} interface).
677       */
678      public synchronized void removeAllElements() {
679 <        Arrays.fill(elementData, 0, elementCount, null);
679 >        final Object[] es = elementData;
680 >        for (int to = elementCount, i = elementCount = 0; i < to; i++)
681 >            es[i] = null;
682          modCount++;
681 –        elementCount = 0;
683      }
684  
685      /**
# Line 1028 | Line 1029 | public class Vector<E>
1029              for (i = beg; i < end; i++)
1030                  if (isClear(deathRow, i - beg))
1031                      es[w++] = es[i];
1032 <            Arrays.fill(es, elementCount = w, end, null);
1032 >            for (i = elementCount = w; i < end; i++)
1033 >                es[i] = null;
1034              // checkInvariants();
1035              return true;
1036          } else {
# Line 1159 | Line 1161 | public class Vector<E>
1161       * (If {@code toIndex==fromIndex}, this operation has no effect.)
1162       */
1163      protected synchronized void removeRange(int fromIndex, int toIndex) {
1162 –        final Object[] es = elementData;
1163 –        final int oldSize = elementCount;
1164 –        System.arraycopy(es, toIndex, es, fromIndex, oldSize - toIndex);
1165 –
1164          modCount++;
1165 <        Arrays.fill(es, elementCount -= (toIndex - fromIndex), oldSize, null);
1165 >        shiftTailOverGap(elementData, fromIndex, toIndex);
1166          // checkInvariants();
1167      }
1168  
1169 +    /** Erases the gap from lo to hi, by sliding down following elements. */
1170 +    private void shiftTailOverGap(Object[] es, int lo, int hi) {
1171 +        System.arraycopy(es, hi, es, lo, elementCount - hi);
1172 +        for (int to = elementCount, i = (elementCount -= hi - lo); i < to; i++)
1173 +            es[i] = null;
1174 +    }
1175 +
1176      /**
1177       * Saves the state of the {@code Vector} instance to a stream
1178       * (that is, serializes it).

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines