提交 69508d02 编写于 作者: M mullan

7172522: Improve DomainCombiner checking

Reviewed-by: vinnie, ahgross
上级 f93afbf5
/* /*
* 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 { ...@@ -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 { ...@@ -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));
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册