stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

7172522: Improve DomainCombiner checking

Browse Source 
Reviewed-by: vinnie, ahgross
This commit is contained in:
Sean Mullan 2012-06-18 10:00:55 -04:00
parent a15896d20e
commit d87e57ac8a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jdk/src/share/classes/java/security/AccessController.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -293,7 +293,7 @@ public final class AccessController {
DomainCombiner dc = null; DomainCombiner dc = null;
AccessControlContext acc = getStackAccessControlContext(); AccessControlContext acc = getStackAccessControlContext();
if (acc == null || (dc = acc.getAssignedCombiner()) == null) { if (acc == null || (dc = acc.getAssignedCombiner()) == null) {
return AccessController.doPrivileged(action); return AccessController.doPrivileged(action, acc);
} }
return AccessController.doPrivileged(action, preserveCombiner(dc)); return AccessController.doPrivileged(action, preserveCombiner(dc));
} }
@ -389,7 +389,7 @@ public final class AccessController {
DomainCombiner dc = null; DomainCombiner dc = null;
AccessControlContext acc = getStackAccessControlContext(); AccessControlContext acc = getStackAccessControlContext();
if (acc == null || (dc = acc.getAssignedCombiner()) == null) { if (acc == null || (dc = acc.getAssignedCombiner()) == null) {
return AccessController.doPrivileged(action); return AccessController.doPrivileged(action, acc);
} }
return AccessController.doPrivileged(action, preserveCombiner(dc)); return AccessController.doPrivileged(action, preserveCombiner(dc));
} }