--- a/jdk/src/share/classes/java/util/PriorityQueue.java	Sun May 09 00:59:30 2010 -0700
+++ b/jdk/src/share/classes/java/util/PriorityQueue.java	Sun May 09 00:59:49 2010 -0700
@@ -170,17 +170,21 @@
      * @throws NullPointerException if the specified collection or any
      *         of its elements are null
      */
+    @SuppressWarnings("unchecked")
     public PriorityQueue(Collection<? extends E> c) {
-        initFromCollection(c);
-        if (c instanceof SortedSet)
-            comparator = (Comparator<? super E>)
-                ((SortedSet<? extends E>)c).comparator();
-        else if (c instanceof PriorityQueue)
-            comparator = (Comparator<? super E>)
-                ((PriorityQueue<? extends E>)c).comparator();
+        if (c instanceof SortedSet<?>) {
+            SortedSet<? extends E> ss = (SortedSet<? extends E>) c;
+            this.comparator = (Comparator<? super E>) ss.comparator();
+            initElementsFromCollection(ss);
+        }
+        else if (c instanceof PriorityQueue<?>) {
+            PriorityQueue<? extends E> pq = (PriorityQueue<? extends E>) c;
+            this.comparator = (Comparator<? super E>) pq.comparator();
+            initFromPriorityQueue(pq);
+        }
         else {
-            comparator = null;
-            heapify();
+            this.comparator = null;
+            initFromCollection(c);
         }
     }
 
@@ -198,9 +202,10 @@
      * @throws NullPointerException if the specified priority queue or any
      *         of its elements are null
      */
+    @SuppressWarnings("unchecked")
     public PriorityQueue(PriorityQueue<? extends E> c) {
-        comparator = (Comparator<? super E>)c.comparator();
-        initFromCollection(c);
+        this.comparator = (Comparator<? super E>) c.comparator();
+        initFromPriorityQueue(c);
     }
 
     /**
@@ -216,9 +221,33 @@
      * @throws NullPointerException if the specified sorted set or any
      *         of its elements are null
      */
+    @SuppressWarnings("unchecked")
     public PriorityQueue(SortedSet<? extends E> c) {
-        comparator = (Comparator<? super E>)c.comparator();
-        initFromCollection(c);
+        this.comparator = (Comparator<? super E>) c.comparator();
+        initElementsFromCollection(c);
+    }
+
+    private void initFromPriorityQueue(PriorityQueue<? extends E> c) {
+        if (c.getClass() == PriorityQueue.class) {
+            this.queue = c.toArray();
+            this.size = c.size();
+        } else {
+            initFromCollection(c);
+        }
+    }
+
+    private void initElementsFromCollection(Collection<? extends E> c) {
+        Object[] a = c.toArray();
+        // If c.toArray incorrectly doesn't return Object[], copy it.
+        if (a.getClass() != Object[].class)
+            a = Arrays.copyOf(a, a.length, Object[].class);
+        int len = a.length;
+        if (len == 1 || this.comparator != null)
+            for (int i = 0; i < len; i++)
+                if (a[i] == null)
+                    throw new NullPointerException();
+        this.queue = a;
+        this.size = a.length;
     }
 
     /**
@@ -227,12 +256,8 @@
      * @param c the collection
      */
     private void initFromCollection(Collection<? extends E> c) {
-        Object[] a = c.toArray();
-        // If c.toArray incorrectly doesn't return Object[], copy it.
-        if (a.getClass() != Object[].class)
-            a = Arrays.copyOf(a, a.length, Object[].class);
-        queue = a;
-        size = a.length;
+        initElementsFromCollection(c);
+        heapify();
     }
 
     /**

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/util/PriorityQueue/NoNulls.java	Sun May 09 00:59:49 2010 -0700
@@ -0,0 +1,204 @@
+/*
+ * 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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.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 Martin Buchholz with assistance from members of JCP JSR-166
+ * Expert Group and released to the public domain, as explained at
+ * http://creativecommons.org/licenses/publicdomain
+ */
+
+/*
+ * @test
+ * @bug 6950540
+ * @summary Attempt to add a null throws NullPointerException
+ */
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.PriorityQueue;
+import java.util.SortedSet;
+import java.util.TreeSet;
+import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.LinkedBlockingDeque;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.PriorityBlockingQueue;
+
+public class NoNulls {
+    void test(String[] args) throws Throwable {
+        final Comparator<String> nullTolerantComparator
+            = new Comparator<>() {
+            public int compare(String x, String y) {
+                return (x == null ? -1 :
+                        y == null ? 1 :
+                        x.compareTo(y));
+            }};
+
+        final SortedSet<String> nullSortedSet
+            = new TreeSet<>(nullTolerantComparator);
+        nullSortedSet.add(null);
+
+        final PriorityQueue<String> nullPriorityQueue
+            = new PriorityQueue<>() {
+            public Object[] toArray() { return new Object[] { null };}};
+
+        final Collection<String> nullCollection = new ArrayList<>();
+        nullCollection.add(null);
+
+        THROWS(NullPointerException.class,
+               new F() { void f() {
+                   new PriorityQueue<String>(nullCollection);
+               }},
+               new F() { void f() {
+                   new PriorityBlockingQueue<String>(nullCollection);
+               }},
+               new F() { void f() {
+                   new ArrayBlockingQueue<String>(10, false, nullCollection);
+               }},
+               new F() { void f() {
+                   new ArrayBlockingQueue<String>(10, true, nullCollection);
+               }},
+               new F() { void f() {
+                   new LinkedBlockingQueue<String>(nullCollection);
+               }},
+               new F() { void f() {
+                   new LinkedBlockingDeque<String>(nullCollection);
+               }},
+
+               new F() { void f() {
+                   new PriorityQueue<String>((Collection<String>) nullPriorityQueue);
+               }},
+               new F() { void f() {
+                   new PriorityBlockingQueue<String>((Collection<String>) nullPriorityQueue);
+               }},
+
+               new F() { void f() {
+                   new PriorityQueue<String>(nullSortedSet);
+               }},
+               new F() { void f() {
+                   new PriorityBlockingQueue<String>(nullSortedSet);
+               }},
+
+               new F() { void f() {
+                   new PriorityQueue<String>((Collection<String>) nullSortedSet);
+               }},
+               new F() { void f() {
+                   new PriorityBlockingQueue<String>((Collection<String>) nullSortedSet);
+               }},
+
+               new F() { void f() {
+                   new PriorityQueue<String>(nullPriorityQueue);
+               }},
+               new F() { void f() {
+                   new PriorityBlockingQueue<String>(nullPriorityQueue);
+               }},
+
+               new F() { void f() {
+                   new PriorityQueue<String>().add(null);
+               }},
+               new F() { void f() {
+                   new PriorityBlockingQueue<String>().add(null);
+               }},
+               new F() { void f() {
+                   new ArrayBlockingQueue<String>(10, false).add(null);
+               }},
+               new F() { void f() {
+                   new ArrayBlockingQueue<String>(10, true).add(null);
+               }},
+               new F() { void f() {
+                   new LinkedBlockingQueue<String>().add(null);
+               }},
+               new F() { void f() {
+                   new LinkedBlockingDeque<String>().add(null);
+               }},
+
+               new F() { void f() {
+                   new PriorityQueue<String>().offer(null);
+               }},
+               new F() { void f() {
+                   new PriorityBlockingQueue<String>().offer(null);
+               }});
+
+        nullSortedSet.add("foo");
+        nullCollection.add("foo");
+        THROWS(NullPointerException.class,
+               new F() { void f() {
+                   new PriorityQueue<String>(nullCollection);
+               }},
+               new F() { void f() {
+                   new PriorityBlockingQueue<String>(nullCollection);
+               }},
+
+               new F() { void f() {
+                   new PriorityQueue<String>((Collection<String>) nullPriorityQueue);
+               }},
+               new F() { void f() {
+                   new PriorityBlockingQueue<String>((Collection<String>) nullPriorityQueue);
+               }},
+
+               new F() { void f() {
+                   new PriorityQueue<String>(nullSortedSet);
+               }},
+               new F() { void f() {
+                   new PriorityBlockingQueue<String>(nullSortedSet);
+               }},
+
+               new F() { void f() {
+                   new PriorityQueue<String>((Collection<String>) nullSortedSet);
+               }},
+               new F() { void f() {
+                   new PriorityBlockingQueue<String>((Collection<String>) nullSortedSet);
+               }});
+
+    }
+
+    //--------------------- Infrastructure ---------------------------
+    volatile int passed = 0, failed = 0;
+    void pass() {passed++;}
+    void fail() {failed++; Thread.dumpStack();}
+    void fail(String msg) {System.err.println(msg); fail();}
+    void unexpected(Throwable t) {failed++; t.printStackTrace();}
+    void check(boolean cond) {if (cond) pass(); else fail();}
+    void equal(Object x, Object y) {
+        if (x == null ? y == null : x.equals(y)) pass();
+        else fail(x + " not equal to " + y);}
+    public static void main(String[] args) throws Throwable {
+        new NoNulls().instanceMain(args);}
+    public void instanceMain(String[] args) throws Throwable {
+        try {test(args);} catch (Throwable t) {unexpected(t);}
+        System.out.printf("%nPassed = %d, failed = %d%n%n", passed, failed);
+        if (failed > 0) throw new AssertionError("Some tests failed");}
+    abstract class F {abstract void f() throws Throwable;}
+    void THROWS(Class<? extends Throwable> k, F... fs) {
+        for (F f : fs)
+            try {f.f(); fail("Expected " + k.getName() + " not thrown");}
+            catch (Throwable t) {
+                if (k.isAssignableFrom(t.getClass())) pass();
+                else unexpected(t);}}
+}