archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 14:54:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8285263: Minor cleanup could be done in java.security

Browse source 
Reviewed-by: weijun
This commit is contained in:
Mark Powers 2022-06-13 15:13:56 +00:00 • committed by Weijun Wang
parent b97a4f6cdc
commit 17695962ac
94 changed files with 480 additions and 601 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/java.base/share/classes/java/security/ProtectionDomain.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -134,13 +134,13 @@ public class ProtectionDomain {
}
/* CodeSource */
private CodeSource codesource ;
private final CodeSource codesource ;
/* ClassLoader the protection domain was consed from */
private ClassLoader classloader;
private final ClassLoader classloader;
/* Principals running-as within this protection domain */
private Principal[] principals;
private final Principal[] principals;
/* the rights this protection domain is granted */
private PermissionCollection permissions;
@ -371,7 +371,7 @@ public class ProtectionDomain {
Policy policy = Policy.getPolicyNoCheck();
if (policy instanceof PolicyFile) {
// The PolicyFile implementation supports compatibility
// inside and it also covers the static permissions.
// inside, and it also covers the static permissions.
return policy.implies(this, perm);
} else {
if (policy.implies(this, perm)) {
@ -447,7 +447,7 @@ public class ProtectionDomain {
*
* . SecurityManager is not null,
* debug is not null,
* SecurityManager impelmentation is in bootclasspath,
* SecurityManager implementation is in bootclasspath,
* Policy implementation is in bootclasspath
* (the bootclasspath restrictions avoid recursion)
*
@ -463,22 +463,18 @@ public class ProtectionDomain {
return true;
} else {
if (DebugHolder.debug != null) {
if (sm.getClass().getClassLoader() == null &&
Policy.getPolicyNoCheck().getClass().getClassLoader()
== null) {
return true;
}
return sm.getClass().getClassLoader() == null &&
Policy.getPolicyNoCheck().getClass().getClassLoader()
== null;
} else {
try {
sm.checkPermission(SecurityConstants.GET_POLICY_PERMISSION);
return true;
} catch (SecurityException se) {
// fall thru and return false
return false;
}
}
}
return false;
}
private PermissionCollection mergePermissions() {
@ -488,12 +484,8 @@ public class ProtectionDomain {
@SuppressWarnings("removal")
PermissionCollection perms =
java.security.AccessController.doPrivileged
(new java.security.PrivilegedAction<>() {
public PermissionCollection run() {
Policy p = Policy.getPolicyNoCheck();
return p.getPermissions(ProtectionDomain.this);
}
});
((PrivilegedAction<PermissionCollection>) () ->
Policy.getPolicyNoCheck().getPermissions(ProtectionDomain.this));
Permissions mergedPerms = new Permissions();
int swag = 32;