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.

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

(v0.24.0-release) Set domainCombiner from closest frame in result AccessControlContext #11670

Merged
merged 1 commit into from
Jan 16, 2021
Merged

(v0.24.0-release) Set domainCombiner from closest frame in result AccessControlContext #11670

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion jcl/src/java.base/share/classes/java/security/AccessController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*[INCLUDE-IF Sidecar18-SE]*/
/*******************************************************************************
* Copyright (c) 1998, 2019 IBM Corp. and others
* Copyright (c) 1998, 2021 IBM Corp. and others
*
* This program and the accompanying materials are made available under
* the terms of the Eclipse Public License 2.0 which accompanies this
Expand Down Expand Up @@ -510,6 +510,10 @@ private static AccessControlContext getContextHelper(boolean forDoPrivilegedWith
}
if (null != acc && null != acc.domainCombiner) {
accTmp.domainCombiner = acc.domainCombiner;
if (activeDC == null) {
// This activeDC will be set to accContext.domainCombiner.
activeDC = acc.domainCombiner;
}
}
if (null != domains[j * OBJS_ARRAY_SIZE + OBJS_INDEX_PERMS_OR_CACHECHECKED]) {
// this is frame with limited permissions
Expand Down