changeset 29030:725688906a2b

8072932: Test fails with java.security.AccessControlException: access denied ("java.security.SecurityPermission" "getDomainCombiner") Reviewed-by: mullan
author jbachorik
date Thu, 12 Feb 2015 17:01:10 +0100
parents f97d41a21983
children 9bad39aa837b
files jdk/src/java.base/share/classes/java/security/ProtectionDomain.java
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/jdk/src/java.base/share/classes/java/security/ProtectionDomain.java	Tue Feb 10 14:10:32 2015 +0100
+++ b/jdk/src/java.base/share/classes/java/security/ProtectionDomain.java	Thu Feb 12 17:01:10 2015 +0100
@@ -88,7 +88,7 @@
         }
 
         private static AccessControlContext getCombinedACC(AccessControlContext context, AccessControlContext stack) {
-            AccessControlContext acc = new AccessControlContext(context, stack.getDomainCombiner(), true);
+            AccessControlContext acc = new AccessControlContext(context, stack.getCombiner(), true);
 
             return new AccessControlContext(stack.getContext(), acc).optimize();
         }