--- old/src/share/classes/java/security/DomainCombiner.java 2013-06-27 23:05:16.249546446 -0700
+++ new/src/share/classes/java/security/DomainCombiner.java 2013-06-27 23:05:16.085546449 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, 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
@@ -26,27 +26,27 @@
package java.security;
/**
- * A DomainCombiner
provides a means to dynamically
+ * A {@code DomainCombiner} provides a means to dynamically
* update the ProtectionDomains associated with the current
- * AccessControlContext
.
+ * {@code AccessControlContext}.
*
- *
A DomainCombiner
is passed as a parameter to the
- * appropriate constructor for AccessControlContext
.
+ *
A {@code DomainCombiner} is passed as a parameter to the
+ * appropriate constructor for {@code AccessControlContext}.
* The newly constructed context is then passed to the
- * AccessController.doPrivileged(..., context)
method
- * to bind the provided context (and associated DomainCombiner
)
+ * {@code AccessController.doPrivileged(..., context)} method
+ * to bind the provided context (and associated {@code DomainCombiner})
* with the current execution Thread. Subsequent calls to
- * AccessController.getContext
or
- * AccessController.checkPermission
- * cause the DomainCombiner.combine
to get invoked.
+ * {@code AccessController.getContext} or
+ * {@code AccessController.checkPermission}
+ * cause the {@code DomainCombiner.combine} to get invoked.
*
*
The combine method takes two arguments. The first argument represents
* an array of ProtectionDomains from the current execution Thread,
- * since the most recent call to AccessController.doPrivileged
.
+ * since the most recent call to {@code AccessController.doPrivileged}.
* If no call to doPrivileged was made, then the first argument will contain
* all the ProtectionDomains from the current execution Thread.
* The second argument represents an array of inherited ProtectionDomains,
- * which may be null
. ProtectionDomains may be inherited
+ * which may be {@code null}. ProtectionDomains may be inherited
* from a parent Thread, or from a privileged context. If no call to
* doPrivileged was made, then the second argument will contain the
* ProtectionDomains inherited from the parent Thread. If one or more calls
@@ -54,25 +54,25 @@
* doPrivileged(action, context), then the second argument will contain the
* ProtectionDomains from the privileged context. If the most recent call
* was to doPrivileged(action), then there is no privileged context,
- * and the second argument will be null
.
+ * and the second argument will be {@code null}.
*
- *
The combine
method investigates the two input arrays
+ *
The {@code combine} method investigates the two input arrays
* of ProtectionDomains and returns a single array containing the updated
- * ProtectionDomains. In the simplest case, the combine
+ * ProtectionDomains. In the simplest case, the {@code combine}
* method merges the two stacks into one. In more complex cases,
- * the combine
method returns a modified
+ * the {@code combine} method returns a modified
* stack of ProtectionDomains. The modification may have added new
* ProtectionDomains, removed certain ProtectionDomains, or simply
* updated existing ProtectionDomains. Re-ordering and other optimizations
* to the ProtectionDomains are also permitted. Typically the
- * combine
method bases its updates on the information
- * encapsulated in the DomainCombiner
.
+ * {@code combine} method bases its updates on the information
+ * encapsulated in the {@code DomainCombiner}.
*
- *
After the AccessController.getContext
method
+ *
After the {@code AccessController.getContext} method
* receives the combined stack of ProtectionDomains back from
- * the DomainCombiner
, it returns a new
+ * the {@code DomainCombiner}, it returns a new
* AccessControlContext that has both the combined ProtectionDomains
- * as well as the DomainCombiner
.
+ * as well as the {@code DomainCombiner}.
*
* @see AccessController
* @see AccessControlContext
@@ -91,21 +91,21 @@
*
* @param currentDomains the ProtectionDomains associated with the
* current execution Thread, up to the most recent
- * privileged ProtectionDomain
.
+ * privileged {@code ProtectionDomain}.
* The ProtectionDomains are are listed in order of execution,
- * with the most recently executing ProtectionDomain
+ * with the most recently executing {@code ProtectionDomain}
* residing at the beginning of the array. This parameter may
- * be null
if the current execution Thread
+ * be {@code null} if the current execution Thread
* has no associated ProtectionDomains.
*
* @param assignedDomains an array of inherited ProtectionDomains.
* ProtectionDomains may be inherited from a parent Thread,
- * or from a privileged AccessControlContext
.
- * This parameter may be null
+ * or from a privileged {@code AccessControlContext}.
+ * This parameter may be {@code null}
* if there are no inherited ProtectionDomains.
*
* @return a new array consisting of the updated ProtectionDomains,
- * or null
.
+ * or {@code null}.
*/
ProtectionDomain[] combine(ProtectionDomain[] currentDomains,
ProtectionDomain[] assignedDomains);