Mercurial > hg > release > icedtea7-forest-2.1 > jdk
changeset 4972:94b16322eb0b
8011806: 7u25-b05 hotspot fastdebug build failure
Summary: Backed out changeset 05a8336b1eab
Reviewed-by: mullan
author | asaha |
---|---|
date | Tue, 09 Apr 2013 12:39:40 -0700 |
parents | 66420635ccfc |
children | 2a78c210f0e2 |
files | src/share/classes/java/security/AccessControlContext.java src/share/classes/java/security/ProtectionDomain.java |
diffstat | 2 files changed, 4 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/classes/java/security/AccessControlContext.java Tue May 21 10:25:40 2013 -0700 +++ b/src/share/classes/java/security/AccessControlContext.java Tue Apr 09 12:39:40 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2011, 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 @@ -79,10 +79,7 @@ public final class AccessControlContext { private ProtectionDomain context[]; - // isPrivileged and isAuthorized are referenced by the VM - do not remove - // or change their names private boolean isPrivileged; - private boolean isAuthorized = false; // Note: This field is directly used by the virtual machine // native codes. Don't touch it. @@ -168,7 +165,6 @@ SecurityManager sm = System.getSecurityManager(); if (sm != null) { sm.checkPermission(SecurityConstants.CREATE_ACC_PERMISSION); - this.isAuthorized = true; } this.context = acc.context; @@ -190,7 +186,6 @@ this.context = context.clone(); } this.combiner = combiner; - this.isAuthorized = true; } /** @@ -198,11 +193,10 @@ */ AccessControlContext(ProtectionDomain context[], - boolean isPrivileged) + boolean isPrivileged) { this.context = context; this.isPrivileged = isPrivileged; - this.isAuthorized = true; } /** @@ -483,7 +477,7 @@ } private AccessControlContext goCombiner(ProtectionDomain[] current, - AccessControlContext assigned) { + AccessControlContext assigned) { // the assigned ACC's combiner is not null -- // let the combiner do its thing @@ -505,7 +499,6 @@ this.context = combinedPds; this.combiner = assigned.combiner; this.isPrivileged = false; - this.isAuthorized = assigned.isAuthorized; return this; }
--- a/src/share/classes/java/security/ProtectionDomain.java Tue May 21 10:25:40 2013 -0700 +++ b/src/share/classes/java/security/ProtectionDomain.java Tue Apr 09 12:39:40 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2011, 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 @@ -278,11 +278,6 @@ return false; } - // called by the VM -- do not remove - boolean impliesCreateAccessControlContext() { - return implies(SecurityConstants.CREATE_ACC_PERMISSION); - } - /** * Convert a ProtectionDomain to a String. */