< prev index next >
src/share/classes/java/util/ArrayList.java
Print this page
rev 12533 : 8174109: Better queuing priorities
Reviewed-by: smarks
@@ -1,7 +1,7 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation. Oracle designates this
@@ -26,10 +26,11 @@
package java.util;
import java.util.function.Consumer;
import java.util.function.Predicate;
import java.util.function.UnaryOperator;
+import sun.misc.SharedSecrets;
/**
* Resizable-array implementation of the <tt>List</tt> interface. Implements
* all optional list operations, and permits all elements, including
* <tt>null</tt>. In addition to implementing the <tt>List</tt> interface,
@@ -217,16 +218,19 @@
if (minCapacity > minExpand) {
ensureExplicitCapacity(minCapacity);
}
}
- private void ensureCapacityInternal(int minCapacity) {
+ private static int calculateCapacity(Object[] elementData, int minCapacity) {
if (elementData == DEFAULTCAPACITY_EMPTY_ELEMENTDATA) {
- minCapacity = Math.max(DEFAULT_CAPACITY, minCapacity);
+ return Math.max(DEFAULT_CAPACITY, minCapacity);
+ }
+ return minCapacity;
}
- ensureExplicitCapacity(minCapacity);
+ private void ensureCapacityInternal(int minCapacity) {
+ ensureExplicitCapacity(calculateCapacity(elementData, minCapacity));
}
private void ensureExplicitCapacity(int minCapacity) {
modCount++;
@@ -781,10 +785,12 @@
// Read in capacity
s.readInt(); // ignored
if (size > 0) {
// be like clone(), allocate array based upon size not capacity
+ int capacity = calculateCapacity(elementData, size);
+ SharedSecrets.getJavaOISAccess().checkArray(s, Object[].class, capacity);
ensureCapacityInternal(size);
Object[] a = elementData;
// Read in all elements in the proper order.
for (int i=0; i<size; i++) {
< prev index next >