archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 14:54:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8203184: List.copyOf() fails to copy sublists

Browse source 
Reviewed-by: psandoz
This commit is contained in:
Stuart Marks 2018-06-21 08:45:57 -07:00
parent 693a6dd27a
commit 277b35da28
3 changed files with 30 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/java.base/share/classes/java/util/ImmutableCollections.java
View file

@ -83,6 +83,16 @@ class ImmutableCollections {
// ---------- List Implementations ----------
// make a copy, short-circuiting based on implementation class
@SuppressWarnings("unchecked")
static <E> List<E> listCopy(Collection<? extends E> coll) {
if (coll instanceof AbstractImmutableList && coll.getClass() != SubList.class) {
return (List<E>)coll;
} else {
return (List<E>)List.of(coll.toArray());
}
}
@SuppressWarnings("unchecked")
static <E> List<E> emptyList() {
return (List<E>) ListN.EMPTY_LIST;

7
src/java.base/share/classes/java/util/List.java
View file

@ -1057,12 +1057,7 @@ public interface List<E> extends Collection<E> {
* @throws NullPointerException if coll is null, or if it contains any nulls
* @since 10
*/
@SuppressWarnings("unchecked")
static <E> List<E> copyOf(Collection<? extends E> coll) {
if (coll instanceof ImmutableCollections.AbstractImmutableList) {
return (List<E>)coll;
} else {
return (List<E>)List.of(coll.toArray());
}
return ImmutableCollections.listCopy(coll);
}
}