From 312b920fb9de5b2e9524b307f169d59156b2a31d Mon Sep 17 00:00:00 2001
From: Weijun Wang <weijun@openjdk.org>
Date: Fri, 13 Sep 2013 15:37:39 +0800
Subject: [PATCH] 8024306: Enhance Subject consistency

Also reviewed by Alexander Fomin

Reviewed-by: mullan, ahgross
---
 jdk/src/share/classes/javax/security/auth/Subject.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/jdk/src/share/classes/javax/security/auth/Subject.java b/jdk/src/share/classes/javax/security/auth/Subject.java
index 1db0811483c..afc74ade43d 100644
--- a/jdk/src/share/classes/javax/security/auth/Subject.java
+++ b/jdk/src/share/classes/javax/security/auth/Subject.java
@@ -964,6 +964,10 @@ public final class Subject implements java.io.Serializable {
 
         s.defaultReadObject();
 
+        // Rewrap the principals into a SecureSet
+        principals = Collections.synchronizedSet(new SecureSet<Principal>
+                                (this, PRINCIPAL_SET, principals));
+
         // The Credential {@code Set} is not serialized, but we do not
         // want the default deserialization routine to set it to null.
         this.pubCredentials = Collections.synchronizedSet