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.48 by jsr166, Wed Mar 28 02:50:41 2018 UTC vs.
Revision 1.53 by jsr166, Mon Oct 1 00:10:53 2018 UTC

# Line 25 | Line 25
25  
26   package java.util;
27  
28 + import java.io.IOException;
29 + import java.io.ObjectInputStream;
30 + import java.io.StreamCorruptedException;
31   import java.util.function.Consumer;
32   import java.util.function.Predicate;
33   import java.util.function.UnaryOperator;
# Line 70 | Line 73 | import java.util.function.UnaryOperator;
73   *
74   * <p>As of the Java 2 platform v1.2, this class was retrofitted to
75   * implement the {@link List} interface, making it a member of the
76 < * <a href="{@docRoot}/java/util/package-summary.html#CollectionsFramework">
76 > * <a href="{@docRoot}/java.base/java/util/package-summary.html#CollectionsFramework">
77   * Java Collections Framework</a>.  Unlike the new collection
78   * implementations, {@code Vector} is synchronized.  If a thread-safe
79   * implementation is not needed, it is recommended to use {@link
# Line 1177 | Line 1180 | public class Vector<E>
1180      }
1181  
1182      /**
1183 +     * Loads a {@code Vector} instance from a stream
1184 +     * (that is, deserializes it).
1185 +     * This method performs checks to ensure the consistency
1186 +     * of the fields.
1187 +     *
1188 +     * @param in the stream
1189 +     * @throws java.io.IOException if an I/O error occurs
1190 +     * @throws ClassNotFoundException if the stream contains data
1191 +     *         of a non-existing class
1192 +     */
1193 +    private void readObject(ObjectInputStream in)
1194 +            throws IOException, ClassNotFoundException {
1195 +        ObjectInputStream.GetField gfields = in.readFields();
1196 +        int count = gfields.get("elementCount", 0);
1197 +        Object[] data = (Object[])gfields.get("elementData", null);
1198 +        if (count < 0 || data == null || count > data.length) {
1199 +            throw new StreamCorruptedException("Inconsistent vector internals");
1200 +        }
1201 +        elementCount = count;
1202 +        elementData = data.clone();
1203 +    }
1204 +
1205 +    /**
1206       * Saves the state of the {@code Vector} instance to a stream
1207       * (that is, serializes it).
1208       * This method performs synchronization to ensure the consistency
# Line 1385 | Line 1411 | public class Vector<E>
1411              es[i] = operator.apply(elementAt(es, i));
1412          if (modCount != expectedModCount)
1413              throw new ConcurrentModificationException();
1388        modCount++;
1414          // checkInvariants();
1415      }
1416  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines