OpenJDK / jdk8u / jdk8u / jdk
changeset 13597:989d84752527
8213432: Better copies of CopiesList
Reviewed-by: rriggs, skoivu, ahgross, robm, rhalade, jeff
| author | smarks |
|---|---|
| date | Wed, 23 Jan 2019 14:45:54 -0800 |
| parents | 26993f6987f7 |
| children | dacc6a3dd712 |
| files | src/share/classes/java/util/Collections.java |
| diffstat | 1 files changed, 8 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/classes/java/util/Collections.java Wed Jan 30 19:33:04 2019 -0800 +++ b/src/share/classes/java/util/Collections.java Wed Jan 23 14:45:54 2019 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2019, 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,7 @@ package java.util; import java.io.Serializable; +import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.io.IOException; import java.lang.reflect.Array; @@ -37,6 +38,7 @@ import java.util.stream.IntStream; import java.util.stream.Stream; import java.util.stream.StreamSupport; +import sun.misc.SharedSecrets; /** * This class consists exclusively of static methods that operate on or return @@ -5075,6 +5077,11 @@ public Spliterator<E> spliterator() { return stream().spliterator(); } + + private void readObject(ObjectInputStream ois) throws IOException, ClassNotFoundException { + ois.defaultReadObject(); + SharedSecrets.getJavaOISAccess().checkArray(ois, Object[].class, n); + } } /**