From c574449fbf5676bc8e333eedb10c60c2773cbfd6 Mon Sep 17 00:00:00 2001 From: mullan Date: Thu, 7 Feb 2019 08:47:10 -0500 Subject: [PATCH] 8216381: More limited privilege usage Reviewed-by: ahgross, coffeys, rhalade --- src/share/classes/java/security/AccessController.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/share/classes/java/security/AccessController.java b/src/share/classes/java/security/AccessController.java index 36408a8d6..00e084ca9 100644 --- a/src/share/classes/java/security/AccessController.java +++ b/src/share/classes/java/security/AccessController.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2019, 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 @@ -425,7 +425,8 @@ public final class AccessController { throw new NullPointerException("null permissions parameter"); } Class caller = Reflection.getCallerClass(); - return AccessController.doPrivileged(action, createWrapper(null, + DomainCombiner dc = (context == null) ? null : context.getCombiner(); + return AccessController.doPrivileged(action, createWrapper(dc, caller, parent, context, perms)); } @@ -710,7 +711,8 @@ public final class AccessController { throw new NullPointerException("null permissions parameter"); } Class caller = Reflection.getCallerClass(); - return AccessController.doPrivileged(action, createWrapper(null, caller, parent, context, perms)); + DomainCombiner dc = (context == null) ? null : context.getCombiner(); + return AccessController.doPrivileged(action, createWrapper(dc, caller, parent, context, perms)); } -- GitLab