# HG changeset patch
# User kevinw
# Date 1425476514 0
# Node ID 444ae429c77be53df0b35483d9cf6ce17118e197
# Parent  569ad82d3904f66d372edfd58532f4e1b1b0b20a
8072932: Test fails with java.security.AccessControlException: access denied ("java.security.SecurityPermission" "getDomainCombiner")
Reviewed-by: jbachorik

diff -r 569ad82d3904 -r 444ae429c77b src/share/classes/java/security/ProtectionDomain.java
--- openjdk/jdk/src/share/classes/java/security/ProtectionDomain.java	Mon Mar 02 18:38:00 2015 +0000
+++ openjdk/jdk/src/share/classes/java/security/ProtectionDomain.java	Wed Mar 04 13:41:54 2015 +0000
@@ -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();
         }