Set domainCombiner from closest frame in result AccessControlContext

Set domainCombiner from closest frame in result AccessControlContext of j.s.AccessController.getContextHelper() if the activeDC is null. Signed-off-by: Jason Feng <[email protected]>
eclipse-openj9 · Jan 16, 2021 · bfa6a6f · bfa6a6f
1 parent 3aeef4a
commit bfa6a6f
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/jcl/src/java.base/share/classes/java/security/AccessController.java b/jcl/src/java.base/share/classes/java/security/AccessController.java
@@ -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
@@ -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