Skip to content

Commit

Permalink
Merge pull request #11670 from JasonFengJ9/setdc-v24
Browse files Browse the repository at this point in the history
(v0.24.0-release) Set domainCombiner from closest frame in result AccessControlContext
  • Loading branch information
pshipton authored Jan 16, 2021
2 parents 3aeef4a + bfa6a6f commit 82b570c
Showing 1 changed file with 5 additions and 1 deletion.
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

0 comments on commit 82b570c

Please sign in to comment.