--- jsr166/src/main/java/util/Vector.java 2016/11/30 03:31:47 1.37
+++ jsr166/src/main/java/util/Vector.java 2018/05/05 18:29:53 1.50
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1994, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,9 @@
package java.util;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.StreamCorruptedException;
import java.util.function.Consumer;
import java.util.function.Predicate;
import java.util.function.UnaryOperator;
@@ -70,7 +73,7 @@ import java.util.function.UnaryOperator;
*
*
As of the Java 2 platform v1.2, this class was retrofitted to
* implement the {@link List} interface, making it a member of the
- *
+ *
* Java Collections Framework. Unlike the new collection
* implementations, {@code Vector} is synchronized. If a thread-safe
* implementation is not needed, it is recommended to use {@link
@@ -306,8 +309,9 @@ public class Vector
modCount++;
if (newSize > elementData.length)
grow(newSize);
- for (int i = newSize; i < elementCount; i++)
- elementData[i] = null;
+ final Object[] es = elementData;
+ for (int to = elementCount, i = newSize; i < to; i++)
+ es[i] = null;
elementCount = newSize;
}
@@ -676,9 +680,10 @@ public class Vector
* method (which is part of the {@link List} interface).
*/
public synchronized void removeAllElements() {
- Arrays.fill(elementData, 0, elementCount, null);
+ final Object[] es = elementData;
+ for (int to = elementCount, i = elementCount = 0; i < to; i++)
+ es[i] = null;
modCount++;
- elementCount = 0;
}
/**
@@ -984,6 +989,9 @@ public class Vector
return bulkRemove(e -> !c.contains(e));
}
+ /**
+ * @throws NullPointerException {@inheritDoc}
+ */
@Override
public boolean removeIf(Predicate super E> filter) {
Objects.requireNonNull(filter);
@@ -1022,13 +1030,13 @@ public class Vector
setBit(deathRow, i - beg);
if (modCount != expectedModCount)
throw new ConcurrentModificationException();
- expectedModCount++;
modCount++;
int w = beg;
for (i = beg; i < end; i++)
if (isClear(deathRow, i - beg))
es[w++] = es[i];
- Arrays.fill(es, elementCount = w, end, null);
+ for (i = elementCount = w; i < end; i++)
+ es[i] = null;
// checkInvariants();
return true;
} else {
@@ -1159,20 +1167,49 @@ public class Vector
* (If {@code toIndex==fromIndex}, this operation has no effect.)
*/
protected synchronized void removeRange(int fromIndex, int toIndex) {
- final Object[] es = elementData;
- final int oldSize = elementCount;
- System.arraycopy(es, toIndex, es, fromIndex, oldSize - toIndex);
-
modCount++;
- Arrays.fill(es, elementCount -= (toIndex - fromIndex), oldSize, null);
+ shiftTailOverGap(elementData, fromIndex, toIndex);
// checkInvariants();
}
+ /** Erases the gap from lo to hi, by sliding down following elements. */
+ private void shiftTailOverGap(Object[] es, int lo, int hi) {
+ System.arraycopy(es, hi, es, lo, elementCount - hi);
+ for (int to = elementCount, i = (elementCount -= hi - lo); i < to; i++)
+ es[i] = null;
+ }
+
/**
- * Save the state of the {@code Vector} instance to a stream (that
- * is, serialize it).
+ * Loads a {@code Vector} instance from a stream
+ * (that is, deserializes it).
+ * This method performs checks to ensure the consistency
+ * of the fields.
+ *
+ * @param in the stream
+ * @throws java.io.IOException if an I/O error occurs
+ * @throws ClassNotFoundException if the stream contains data
+ * of a non-existing class
+ */
+ private void readObject(ObjectInputStream in)
+ throws IOException, ClassNotFoundException {
+ ObjectInputStream.GetField gfields = in.readFields();
+ int count = gfields.get("elementCount", 0);
+ Object[] data = (Object[])gfields.get("elementData", null);
+ if (count < 0 || data == null || count > data.length) {
+ throw new StreamCorruptedException("Inconsistent vector internals");
+ }
+ elementCount = count;
+ elementData = data.clone();
+ }
+
+ /**
+ * Saves the state of the {@code Vector} instance to a stream
+ * (that is, serializes it).
* This method performs synchronization to ensure the consistency
* of the serialized data.
+ *
+ * @param s the stream
+ * @throws java.io.IOException if an I/O error occurs
*/
private void writeObject(java.io.ObjectOutputStream s)
throws java.io.IOException {
@@ -1345,6 +1382,9 @@ public class Vector
}
}
+ /**
+ * @throws NullPointerException {@inheritDoc}
+ */
@Override
public synchronized void forEach(Consumer super E> action) {
Objects.requireNonNull(action);
@@ -1358,6 +1398,9 @@ public class Vector
// checkInvariants();
}
+ /**
+ * @throws NullPointerException {@inheritDoc}
+ */
@Override
public synchronized void replaceAll(UnaryOperator operator) {
Objects.requireNonNull(operator);
@@ -1368,7 +1411,6 @@ public class Vector
es[i] = operator.apply(elementAt(es, i));
if (modCount != expectedModCount)
throw new ConcurrentModificationException();
- modCount++;
// checkInvariants();
}
@@ -1408,7 +1450,7 @@ public class Vector
private int fence; // -1 until used; then one past last index
private int expectedModCount; // initialized when fence set
- /** Create new spliterator covering the given range */
+ /** Creates new spliterator covering the given range. */
VectorSpliterator(Object[] array, int origin, int fence,
int expectedModCount) {
this.array = array;
@@ -1437,9 +1479,8 @@ public class Vector
@SuppressWarnings("unchecked")
public boolean tryAdvance(Consumer super E> action) {
+ Objects.requireNonNull(action);
int i;
- if (action == null)
- throw new NullPointerException();
if (getFence() > (i = index)) {
index = i + 1;
action.accept((E)array[i]);
@@ -1452,26 +1493,14 @@ public class Vector
@SuppressWarnings("unchecked")
public void forEachRemaining(Consumer super E> action) {
- int i, hi; // hoist accesses and checks from loop
- Object[] a;
- if (action == null)
- throw new NullPointerException();
- if ((hi = fence) < 0) {
- synchronized (Vector.this) {
- expectedModCount = modCount;
- a = array = elementData;
- hi = fence = elementCount;
- }
- }
- else
- a = array;
- if (a != null && (i = index) >= 0 && (index = hi) <= a.length) {
- while (i < hi)
- action.accept((E) a[i++]);
- if (modCount == expectedModCount)
- return;
- }
- throw new ConcurrentModificationException();
+ Objects.requireNonNull(action);
+ final int hi = getFence();
+ final Object[] a = array;
+ int i;
+ for (i = index, index = hi; i < hi; i++)
+ action.accept((E) a[i]);
+ if (modCount != expectedModCount)
+ throw new ConcurrentModificationException();
}
public long estimateSize() {