Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

8345502: Remove doIntersectionPrivilege methods #22548

Closed
wants to merge 3 commits into from
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/java.base/share/classes/java/security/Policy.java
Original file line number Diff line number Diff line change
@@ -43,7 +43,7 @@
* supported. Installing a system-wide {@code Policy} object is no longer
* supported. The {@linkplain #setPolicy setPolicy} method has been
* changed to always throw {@code UnsupportedOperationException}. The
* {@linkplain getPolicy getPolicy} method has been changed to always
* {@linkplain #getPolicy getPolicy} method has been changed to always
* return a {@code Policy} object that grants no permissions. There is no
* replacement for the Security Manager or this class.
*/
36 changes: 0 additions & 36 deletions src/java.base/share/classes/java/security/ProtectionDomain.java
Original file line number Diff line number Diff line change
@@ -25,9 +25,6 @@

package java.security;

import jdk.internal.access.JavaSecurityAccess;
import jdk.internal.access.SharedSecrets;

/**
* The {@code ProtectionDomain} class encapsulates the characteristics of a
* domain, which encloses a set of classes whose instances are granted a set
@@ -51,39 +48,6 @@

public class ProtectionDomain {

private static class JavaSecurityAccessImpl implements JavaSecurityAccess {

private JavaSecurityAccessImpl() {
}

@SuppressWarnings("removal")
@Override
public <T> T doIntersectionPrivilege(
PrivilegedAction<T> action,
final AccessControlContext stack,
final AccessControlContext context) {
if (action == null) {
throw new NullPointerException();
}

return AccessController.doPrivileged(action);
}

@SuppressWarnings("removal")
@Override
public <T> T doIntersectionPrivilege(
PrivilegedAction<T> action,
AccessControlContext context) {
return doIntersectionPrivilege(action,
AccessController.getContext(), context);
}
}

static {
// Set up JavaSecurityAccess in SharedSecrets
SharedSecrets.setJavaSecurityAccess(new JavaSecurityAccessImpl());
}

/* CodeSource */
private final CodeSource codesource ;

This file was deleted.

17 changes: 0 additions & 17 deletions src/java.base/share/classes/jdk/internal/access/SharedSecrets.java
Original file line number Diff line number Diff line change
@@ -39,10 +39,7 @@
import java.io.FileDescriptor;
import java.io.FilePermission;
import java.io.ObjectInputStream;
import java.io.PrintStream;
import java.io.PrintWriter;
import java.io.RandomAccessFile;
import java.security.ProtectionDomain;
import java.security.Signature;
import javax.security.auth.x500.X500Principal;

@@ -89,7 +86,6 @@ public class SharedSecrets {
private static JavaUtilJarAccess javaUtilJarAccess;
private static JavaUtilZipFileAccess javaUtilZipFileAccess;
private static JavaUtilResourceBundleAccess javaUtilResourceBundleAccess;
private static JavaSecurityAccess javaSecurityAccess;
private static JavaSecurityPropertiesAccess javaSecurityPropertiesAccess;
private static JavaSecuritySignatureAccess javaSecuritySignatureAccess;
private static JavaSecuritySpecAccess javaSecuritySpecAccess;
@@ -313,19 +309,6 @@ public static JavaIOFileDescriptorAccess getJavaIOFileDescriptorAccess() {
return access;
}

public static void setJavaSecurityAccess(JavaSecurityAccess jsa) {
javaSecurityAccess = jsa;
}

public static JavaSecurityAccess getJavaSecurityAccess() {
var access = javaSecurityAccess;
if (access == null) {
ensureClassInitialized(ProtectionDomain.class);
access = javaSecurityAccess;
}
return access;
}

public static void setJavaSecurityPropertiesAccess(JavaSecurityPropertiesAccess jspa) {
javaSecurityPropertiesAccess = jspa;
}