From 7ac12f018e50bcd311f120808d85268bf0ee8bc1 Mon Sep 17 00:00:00 2001
From: asaha <unknown>
Date: Thu, 28 Jan 2016 17:06:19 -0800
Subject: [PATCH] 8148522: Backout JDK-8138811 from 2016 Apr CPU repo
 Reviewed-by: igerasim

---
 .../classes/java/security/ProtectionDomain.java      |  5 -----
 .../javax/security/auth/SubjectDomainCombiner.java   | 12 +-----------
 .../sun/misc/JavaSecurityProtectionDomainAccess.java |  5 -----
 3 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/src/share/classes/java/security/ProtectionDomain.java b/src/share/classes/java/security/ProtectionDomain.java
index ffd2def18..b1778490f 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 7c54a32c3..da75d6834 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 3567f350f..95560ffab 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);
 }
-- 
GitLab