--- old/src/share/classes/javax/security/auth/Subject.java	2014-05-24 08:36:48.316875230 -0700
+++ new/src/share/classes/javax/security/auth/Subject.java	2014-05-24 08:36:48.136852349 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2014, 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
@@ -194,17 +194,19 @@
      *
      * @exception NullPointerException if the specified
      *          {@code principals}, {@code pubCredentials},
-     *          or {@code privCredentials} are {@code null}.
+     *          or {@code privCredentials} are {@code null},
+     *          or a null value exists within any of these three
+     *          Sets.
      */
     public Subject(boolean readOnly, Set<? extends Principal> principals,
                    Set<?> pubCredentials, Set<?> privCredentials)
     {
-
-        if (principals == null ||
-            pubCredentials == null ||
-            privCredentials == null)
+        if (collectionNullClean(principals) == false ||
+            collectionNullClean(pubCredentials) == false ||
+            collectionNullClean(privCredentials) == false) {
             throw new NullPointerException
                 (ResourcesMgr.getString("invalid.null.input.s."));
+        }
 
         this.principals = Collections.synchronizedSet(new SecureSet<Principal>
                                 (this, PRINCIPAL_SET, principals));
@@ -970,10 +972,6 @@
         Set<Principal> inputPrincs = (Set<Principal>)gf.get("principals", null);
 
         // Rewrap the principals into a SecureSet
-        if (inputPrincs == null) {
-            throw new NullPointerException
-                (ResourcesMgr.getString("invalid.null.input.s."));
-        }
         try {
             principals = Collections.synchronizedSet(new SecureSet<Principal>
                                 (this, PRINCIPAL_SET, inputPrincs));
@@ -993,6 +991,30 @@
     }
 
     /**
+     * Tests for null-clean collections (both non-null reference and
+     * no null elements)
+     *
+     * @param coll A {@code Collection} to be tested for null references
+     *
+     * @return true if {@code coll} is non-null and contains no null
+     *         elements, false otherwise.
+     */
+    private static boolean collectionNullClean(Collection<?> coll) {
+        boolean isClean = false;
+
+        try {
+            isClean = (coll != null) && !coll.contains(null);
+        } catch (NullPointerException npe) {
+            // A null-hostile collection may choose to return null if
+            // contains(null) is called on it rather than returning false.
+            // If so then we know no nulls are present.
+            isClean = true;
+        }
+
+        return isClean;
+    }
+
+    /**
      * Prevent modifications unless caller has permission.
      *
      * @serial include
@@ -1098,6 +1120,11 @@
 
         public boolean add(E o) {
 
+            if (o == null) {
+                throw new NullPointerException
+                        (ResourcesMgr.getString("invalid.null.input.s."));
+            }
+
             if (subject.isReadOnly()) {
                 throw new IllegalStateException
                         (ResourcesMgr.getString("Subject.is.read.only"));
@@ -1139,6 +1166,11 @@
 
         public boolean remove(Object o) {
 
+            if (o == null) {
+                throw new NullPointerException
+                        (ResourcesMgr.getString("invalid.null.input.s."));
+            }
+
             final Iterator<E> e = iterator();
             while (e.hasNext()) {
                 E next;
@@ -1153,12 +1185,7 @@
                     });
                 }
 
-                if (next == null) {
-                    if (o == null) {
-                        e.remove();
-                        return true;
-                    }
-                } else if (next.equals(o)) {
+                if (next.equals(o)) {
                     e.remove();
                     return true;
                 }
@@ -1167,6 +1194,12 @@
         }
 
         public boolean contains(Object o) {
+
+            if (o == null) {
+                throw new NullPointerException
+                        (ResourcesMgr.getString("invalid.null.input.s."));
+            }
+
             final Iterator<E> e = iterator();
             while (e.hasNext()) {
                 E next;
@@ -1194,19 +1227,28 @@
                     });
                 }
 
-                if (next == null) {
-                    if (o == null) {
-                        return true;
-                    }
-                } else if (next.equals(o)) {
+                if (next.equals(o)) {
                     return true;
                 }
             }
             return false;
         }
 
+        public boolean addAll(Collection<? extends E> c) {
+            if (collectionNullClean(c) == false) {
+                throw new NullPointerException
+                    (ResourcesMgr.getString("invalid.null.input.s."));
+            }
+
+            return (super.addAll(c));
+        }
+
         public boolean removeAll(Collection<?> c) {
-            Objects.requireNonNull(c);
+            if (collectionNullClean(c) == false) {
+                throw new NullPointerException
+                    (ResourcesMgr.getString("invalid.null.input.s."));
+            }
+
             boolean modified = false;
             final Iterator<E> e = iterator();
             while (e.hasNext()) {
@@ -1224,14 +1266,7 @@
 
                 Iterator<?> ce = c.iterator();
                 while (ce.hasNext()) {
-                    Object o = ce.next();
-                    if (next == null) {
-                        if (o == null) {
-                            e.remove();
-                            modified = true;
-                            break;
-                        }
-                    } else if (next.equals(o)) {
+                    if (next.equals(ce.next())) {
                         e.remove();
                         modified = true;
                         break;
@@ -1241,13 +1276,24 @@
             return modified;
         }
 
+        public boolean containsAll(Collection<?> c) {
+            if (collectionNullClean(c) == false) {
+                throw new NullPointerException
+                    (ResourcesMgr.getString("invalid.null.input.s."));
+            }
+
+            return super.containsAll(c);
+        }
+
         public boolean retainAll(Collection<?> c) {
-            Objects.requireNonNull(c);
+            if (collectionNullClean(c) == false) {
+                throw new NullPointerException
+                    (ResourcesMgr.getString("invalid.null.input.s."));
+            }
+
             boolean modified = false;
-            boolean retain = false;
             final Iterator<E> e = iterator();
             while (e.hasNext()) {
-                retain = false;
                 E next;
                 if (which != Subject.PRIV_CREDENTIAL_SET) {
                     next = e.next();
@@ -1260,26 +1306,12 @@
                     });
                 }
 
-                Iterator<?> ce = c.iterator();
-                while (ce.hasNext()) {
-                    Object o = ce.next();
-                    if (next == null) {
-                        if (o == null) {
-                            retain = true;
-                            break;
-                        }
-                    } else if (next.equals(o)) {
-                        retain = true;
-                        break;
-                    }
-                }
-
-                if (!retain) {
+                if (c.contains(next) == false) {
                     e.remove();
-                    retain = false;
                     modified = true;
                 }
             }
+
             return modified;
         }
 
@@ -1338,12 +1370,19 @@
             which = fields.get("which", 0);
 
             LinkedList<E> tmp = (LinkedList<E>) fields.get("elements", null);
+
+            if (Subject.collectionNullClean(tmp) == false) {
+                throw new NullPointerException
+                    (ResourcesMgr.getString("invalid.null.input.s."));
+            }
+
             if (tmp.getClass() != LinkedList.class) {
                 elements = new LinkedList<E>(tmp);
             } else {
                 elements = tmp;
             }
         }
+
     }
 
     /**