update the code; will squash after testing

jcl/src/java.base/share/classes/java/security/AccessControlContext.java

@@ -327,7 +327,6 @@ public AccessControlContext(ProtectionDomain[] fromContext) {
 
 AccessControlContext(ProtectionDomain[] context, AccessControlContext parentAcc, AccessControlContext acc, int authorizeState) {
 	super();
-	boolean contextChanged = false;
 	switch (authorizeState) {
 	default:
 		// authorizeState can't be STATE_UNKNOWN, callerPD is always NULL
@@ -337,6 +336,7 @@ public AccessControlContext(ProtectionDomain[] fromContext) {
 			if (parentAcc == null) {
 				// inherit the domain combiner when authorized
 				this.domainCombiner = acc.domainCombiner;
+				this.context = context;
 			} else {
 				// when parent combiner is not null, use parent combiner to combine the current context
 				DomainCombiner parentCombiner = parentAcc.getCombiner();
@@ -347,24 +347,20 @@ public AccessControlContext(ProtectionDomain[] fromContext) {
 					this.context = combinePDObjs(context, acc.context);
 					this.domainCombiner = acc.domainCombiner;
 				}
-				contextChanged = true;
 			}
 		} else {
 			if (parentAcc != null) {
 				this.domainCombiner = parentAcc.domainCombiner;
 				this.nextStackAcc = parentAcc;
 			}
+			this.context = context;
 		}
 		break;
 	case STATE_NOT_AUTHORIZED:
-		break;
-	}
-	if (!contextChanged) {
 		this.context = context;
+		break;
 	}
-	if (acc != null) {
-		this.doPrivilegedAcc = acc;
-	}
+	this.doPrivilegedAcc = acc;
 	this.authorizeState = authorizeState;
 	this.containPrivilegedContext = true;
 }