Skip to content

8266459: Implement JEP 411: Deprecate the Security Manager for Removal #4073

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.

Sign up for GitHub

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

Closed
wants to merge 14 commits into from
Closed

8266459: Implement JEP 411: Deprecate the Security Manager for Removal #4073

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
576161d
8266459: Implement JEP 411: Deprecate the Security Manager for Removal
wangweij May 16, 2021
26a54a8
manual change before automatic annotating
wangweij May 16, 2021
eb6c566
add supresswarnings annotations automatically
wangweij May 16, 2021
bb73093
feedback from Sean, Phil and Alan
wangweij May 18, 2021
c4221b5
fixing awt/datatransfer/DataFlavor/DataFlavorRemoteTest.java
wangweij May 19, 2021
1f6ff6c
keep only one systemProperty tag
wangweij May 23, 2021
0e8692b
merge from master, two files removed, one needs merge
wangweij May 27, 2021
01dc4c0
move one annotation to new method
wangweij May 27, 2021
8fd09c3
default behavior reverted to allow
wangweij May 31, 2021
926e4b9
rename setSecurityManagerDirect to implSetSecurityManager
wangweij Jun 1, 2021
ea2c4b4
merge from master
wangweij Jun 1, 2021
2c66078
Merge branch 'master'
wangweij Jun 1, 2021
c8bf8bc
merge from master, resolve one conflict
wangweij Jun 2, 2021
331389b
copyright years
wangweij Jun 2, 2021
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
9 changes: 4 additions & 5 deletions src/java.base/share/classes/java/lang/System.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ public static void setSecurityManager(@SuppressWarnings("removal") SecurityManag
if (allowSecurityManager()) {
System.err.println("WARNING: java.lang.System::setSecurityManager" +
" is deprecated and will be removed in a future release.");
setSecurityManagerDirect(sm);
implSetSecurityManager(sm);
} else {
// security manager not allowed
if (sm != null) {
Expand All @@ -377,8 +377,7 @@ public static void setSecurityManager(@SuppressWarnings("removal") SecurityManag
}
}

private static void setSecurityManagerDirect(
@SuppressWarnings("removal") SecurityManager sm) {
private static void implSetSecurityManager(@SuppressWarnings("removal") SecurityManager sm) {
if (security == null) {
// ensure image reader is initialized
Object.class.getResource("java/lang/ANY");
Expand Down Expand Up @@ -2161,7 +2160,7 @@ private static void initPhase3() {
break;
case "":
case "default":
setSecurityManagerDirect(new SecurityManager());
implSetSecurityManager(new SecurityManager());
allowSecurityManager = MAYBE;
needWarning = true;
break;
Expand All @@ -2181,7 +2180,7 @@ private static void initPhase3() {
// custom security manager may be in non-exported package
ctor.setAccessible(true);
SecurityManager sm = (SecurityManager) ctor.newInstance();
setSecurityManagerDirect(sm);
implSetSecurityManager(sm);
needWarning = true;
} catch (Exception e) {
throw new InternalError("Could not create SecurityManager", e);
Expand Down