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

8231800: Better listing of arrays

Browse source 
Reviewed-by: alanb, rhalade, ahgross, igerasim
This commit is contained in:
Stuart Marks 2020-04-07 13:27:55 -07:00
parent 0ffa6b75fd
commit 343ecd806b
5 changed files with 25 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/java.base/share/classes/java/util/Vector.java
View file

@ -179,12 +179,13 @@ public class Vector<E>
* @since 1.2
*/
public Vector(Collection<? extends E> c) {
elementData = c.toArray();
elementCount = elementData.length;
// defend against c.toArray (incorrectly) not returning Object[]
// (see e.g. https://bugs.openjdk.java.net/browse/JDK-6260652)
if (elementData.getClass() != Object[].class)
elementData = Arrays.copyOf(elementData, elementCount, Object[].class);
Object[] a = c.toArray();
elementCount = a.length;
if (c.getClass() == ArrayList.class) {
elementData = a;
} else {
elementData = Arrays.copyOf(a, elementCount, Object[].class);
}
}
/**