diff --git a/src/share/classes/java/security/ProtectionDomain.java b/src/share/classes/java/security/ProtectionDomain.java index ffd2def18d108dcbd33819f34ea5cf70d90e6ad4..b1778490f5a6dacc18e2250ff5e9999472bf5f7c 100644 --- a/src/share/classes/java/security/ProtectionDomain.java +++ b/src/share/classes/java/security/ProtectionDomain.java @@ -475,11 +475,6 @@ public class ProtectionDomain { } }; } - - @Override - public boolean getStaticPermissionsField(ProtectionDomain pd) { - return pd.staticPermissions; - } }); } } diff --git a/src/share/classes/javax/security/auth/SubjectDomainCombiner.java b/src/share/classes/javax/security/auth/SubjectDomainCombiner.java index 7c54a32c3784734c180b5a9d9eb315db7a59d4c3..da75d68342506ca3be7584b41d79a70c08b79199 100644 --- a/src/share/classes/javax/security/auth/SubjectDomainCombiner.java +++ b/src/share/classes/javax/security/auth/SubjectDomainCombiner.java @@ -37,8 +37,6 @@ import java.security.Security; import java.util.Set; import java.util.WeakHashMap; import java.lang.ref.WeakReference; -import sun.misc.SharedSecrets; -import sun.misc.JavaSecurityProtectionDomainAccess; /** * A {@code SubjectDomainCombiner} updates ProtectionDomains @@ -67,9 +65,6 @@ public class SubjectDomainCombiner implements java.security.DomainCombiner { private static final boolean allowCaching = (useJavaxPolicy && cachePolicy()); - private static final JavaSecurityProtectionDomainAccess pdAccess = - SharedSecrets.getJavaSecurityProtectionDomainAccess(); - /** * Associate the provided {@code Subject} with this * {@code SubjectDomainCombiner}. @@ -244,15 +239,10 @@ public class SubjectDomainCombiner implements java.security.DomainCombiner { subjectPd = cachedPDs.getValue(pd); if (subjectPd == null) { - if (pdAccess.getStaticPermissionsField(pd)) { - // Need to keep static ProtectionDomain objects static - subjectPd = pd; - } else { - subjectPd = new ProtectionDomain(pd.getCodeSource(), + subjectPd = new ProtectionDomain(pd.getCodeSource(), pd.getPermissions(), pd.getClassLoader(), principals); - } cachedPDs.putValue(pd, subjectPd); } else { allNew = false; diff --git a/src/share/classes/sun/misc/JavaSecurityProtectionDomainAccess.java b/src/share/classes/sun/misc/JavaSecurityProtectionDomainAccess.java index 3567f350f23cbc47ddfd5335840d702828db78a8..95560ffab68210ca69a5ddc299b80e2780dc0204 100644 --- a/src/share/classes/sun/misc/JavaSecurityProtectionDomainAccess.java +++ b/src/share/classes/sun/misc/JavaSecurityProtectionDomainAccess.java @@ -36,9 +36,4 @@ public interface JavaSecurityProtectionDomainAccess { * Returns the ProtectionDomainCache. */ ProtectionDomainCache getProtectionDomainCache(); - - /** - * Returns the staticPermissions field of the specified object - */ - boolean getStaticPermissionsField(ProtectionDomain pd); }