Mercurial > hg > release > icedtea7-forest-2.3 > jdk

changeset 6350:23de3277d9ed

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8015731: Subject java.security.auth.subject to improvements Reviewed-by: skoivu, mullan
author weijun
date Thu, 13 Jun 2013 10:31:21 +0800
parents 95763758dc59
children ca57fd2d417e
files src/share/classes/javax/security/auth/Subject.java
diffstat 1 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/javax/security/auth/Subject.java	Mon Aug 19 17:51:46 2013 +0200
+++ b/src/share/classes/javax/security/auth/Subject.java	Thu Jun 13 10:31:21 2013 +0800
@@ -1296,8 +1296,14 @@
         {
             ObjectInputStream.GetField fields = ois.readFields();
             subject = (Subject) fields.get("this$0", null);
-            elements = (LinkedList<E>) fields.get("elements", null);
             which = fields.get("which", 0);
+
+            LinkedList<E> tmp = (LinkedList<E>) fields.get("elements", null);
+            if (tmp.getClass() != LinkedList.class) {
+                elements = new LinkedList<E>(tmp);
+            } else {
+                elements = tmp;
+            }
         }
     }