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

6260652: (coll) Arrays.asList(x).toArray().getClass() should be Object[].class

Browse source 
Return Arrays.copyOf(a, a.length, Object[].class)

Reviewed-by: igerasim, psandoz
This commit is contained in:
Martin Buchholz 2015-06-29 15:02:35 -07:00
parent 99f867bded
commit 57996d703c
6 changed files with 10 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

3
jdk/src/java.base/share/classes/java/util/ArrayList.java
View file

@ -178,7 +178,8 @@ public class ArrayList<E> extends AbstractList<E>
public ArrayList(Collection<? extends E> c) { public ArrayList(Collection<? extends E> c) {
elementData = c.toArray(); elementData = c.toArray();
if ((size = elementData.length) != 0) { if ((size = elementData.length) != 0) {
// c.toArray might (incorrectly) not return Object[] (see 6260652) // defend against c.toArray (incorrectly) not returning Object[]
// (see e.g. https://bugs.openjdk.java.net/browse/JDK-6260652)
if (elementData.getClass() != Object[].class) if (elementData.getClass() != Object[].class)
elementData = Arrays.copyOf(elementData, size, Object[].class); elementData = Arrays.copyOf(elementData, size, Object[].class);
} else { } else {

2
jdk/src/java.base/share/classes/java/util/Arrays.java
View file

@ -3820,7 +3820,7 @@ public class Arrays {
@Override @Override
public Object[] toArray() { public Object[] toArray() {
return a.clone(); return Arrays.copyOf(a, a.length, Object[].class);
} }
@Override @Override

3
jdk/src/java.base/share/classes/java/util/Vector.java
View file

@ -174,7 +174,8 @@ public class Vector<E>
public Vector(Collection<? extends E> c) { public Vector(Collection<? extends E> c) {
elementData = c.toArray(); elementData = c.toArray();
elementCount = elementData.length; elementCount = elementData.length;
// c.toArray might (incorrectly) not return Object[] (see 6260652) // defend against c.toArray (incorrectly) not returning Object[]
// (see e.g. https://bugs.openjdk.java.net/browse/JDK-6260652)
if (elementData.getClass() != Object[].class) if (elementData.getClass() != Object[].class)
elementData = Arrays.copyOf(elementData, elementCount, Object[].class); elementData = Arrays.copyOf(elementData, elementCount, Object[].class);
} }

3
jdk/src/java.base/share/classes/java/util/concurrent/CopyOnWriteArrayList.java
View file

@ -134,7 +134,8 @@ public class CopyOnWriteArrayList<E>
elements = ((CopyOnWriteArrayList<?>)c).getArray(); elements = ((CopyOnWriteArrayList<?>)c).getArray();
else { else {
elements = c.toArray(); elements = c.toArray();
// c.toArray might (incorrectly) not return Object[] (see 6260652) // defend against c.toArray (incorrectly) not returning Object[]
// (see e.g. https://bugs.openjdk.java.net/browse/JDK-6260652)
if (elements.getClass() != Object[].class) if (elements.getClass() != Object[].class)
elements = Arrays.copyOf(elements, elements.length, Object[].class); elements = Arrays.copyOf(elements, elements.length, Object[].class);
} }

3
jdk/src/java.desktop/share/classes/sun/awt/util/IdentityArrayList.java
View file

@ -142,7 +142,8 @@ public class IdentityArrayList<E> extends AbstractList<E>
public IdentityArrayList(Collection<? extends E> c) { public IdentityArrayList(Collection<? extends E> c) {
elementData = c.toArray(); elementData = c.toArray();
size = elementData.length; size = elementData.length;
// c.toArray might (incorrectly) not return Object[] (see 6260652) // defend against c.toArray (incorrectly) not returning Object[]
// (see e.g. https://bugs.openjdk.java.net/browse/JDK-6260652)
if (elementData.getClass() != Object[].class) if (elementData.getClass() != Object[].class)
elementData = Arrays.copyOf(elementData, size, Object[].class); elementData = Arrays.copyOf(elementData, size, Object[].class);
} }

8
jdk/test/java/util/Collection/MOAT.java
View file

@ -356,13 +356,7 @@ public class MOAT {
} }
check(c.toArray().length == c.size()); check(c.toArray().length == c.size());
check(c.toArray().getClass() == Object[].class check(c.toArray().getClass() == Object[].class);
||
// !!!!
// 6260652: (coll) Arrays.asList(x).toArray().getClass()
// should be Object[].class
(c.getClass().getName().equals("java.util.Arrays$ArrayList"))
);
for (int size : new int[]{0,1,c.size(), c.size()+1}) { for (int size : new int[]{0,1,c.size(), c.size()+1}) {
Integer[] a = c.toArray(new Integer[size]); Integer[] a = c.toArray(new Integer[size]);
check((size > c.size()) || a.length == c.size()); check((size > c.size()) || a.length == c.size());