--- a/src/share/classes/java/util/concurrent/ArrayBlockingQueue.java Fri Feb 22 12:59:59 2013 -0500+++ b/src/share/classes/java/util/concurrent/ArrayBlockingQueue.java Fri Feb 22 19:01:49 2013 +0100@@ -1,51 +1,21 @@ /*- * 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- * particular file as subject to the "Classpath" exception as provided- * by Oracle in the LICENSE file that accompanied this code.- *- * This code is distributed in the hope that it will be useful, but WITHOUT- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License- * version 2 for more details (a copy is included in the LICENSE file that- * accompanied this code).- *- * You should have received a copy of the GNU General Public License version- * 2 along with this work; if not, write to the Free Software Foundation,- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.- *- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA- * or visit www.oracle.com if you need additional information or have any- * questions.- */--/*- * This file is available under and governed by the GNU General Public- * License version 2 only, as published by the Free Software Foundation.- * However, the following notice accompanied the original version of this- * file:- * * Written by Doug Lea with assistance from members of JCP JSR-166 * Expert Group and released to the public domain, as explained at * http://creativecommons.org/publicdomain/zero/1.0/ */ package java.util.concurrent;+import java.util.Spliterators; import java.util.concurrent.locks.Condition; import java.util.concurrent.locks.ReentrantLock; import java.util.AbstractQueue; import java.util.Collection;-import java.util.Collections; import java.util.Iterator; import java.util.NoSuchElementException; import java.lang.ref.WeakReference; import java.util.Spliterator; import java.util.stream.Stream; import java.util.stream.Streams;-import java.util.function.Consumer; /** * A bounded {@linkplain BlockingQueue blocking queue} backed by an@@ -1399,8 +1369,8 @@ // } }- Spliterator<E> spliterator() { // cheaper to use snapshot than track array- return Collections.arraySnapshotSpliterator+ Spliterator<E> spliterator() {+ return Spliterators.spliterator (this, Spliterator.ORDERED | Spliterator.NONNULL | Spliterator.CONCURRENT); }