--- jsr166/src/main/java/util/ArrayList.java 2006/02/07 20:54:24 1.16 +++ jsr166/src/main/java/util/ArrayList.java 2006/03/19 17:25:10 1.17 @@ -122,31 +122,12 @@ public class ArrayList extends Abstra /** * Constructs a list containing the elements of the specified * collection, in the order they are returned by the collection's - * iterator. The ArrayList instance has an initial capacity of - * 110% the size of the specified collection. + * iterator. * * @param c the collection whose elements are to be placed into this list * @throws NullPointerException if the specified collection is null */ public ArrayList(Collection c) { - int size = c.size(); - // 10% for growth - int cap = ((size/10)+1)*11; - if (cap > 0) { - Object[] a = new Object[cap]; - a[size] = a[size+1] = UNALLOCATED; - Object[] b = c.toArray(a); - if (b[size] == null && b[size+1] == UNALLOCATED) { - b[size+1] = null; - elementData = b; - this.size = size; - return; - } - } - initFromConcurrentlyMutating(c); - } - - private void initFromConcurrentlyMutating(Collection c) { elementData = c.toArray(); size = elementData.length; // c.toArray might (incorrectly) not return Object[] (see 6260652) @@ -154,8 +135,6 @@ public class ArrayList extends Abstra elementData = Arrays.copyOf(elementData, size, Object[].class); } - private final static Object UNALLOCATED = new Object(); - /** * Trims the capacity of this ArrayList instance to be the * list's current size. An application can use this operation to minimize