diff options
author | Bryce McKinlay <bryce@waitaki.otago.ac.nz> | 2002-05-24 11:57:40 +0000 |
---|---|---|
committer | Bryce McKinlay <bryce@gcc.gnu.org> | 2002-05-24 12:57:40 +0100 |
commit | d2f108e266cd19172d664d433e772420e88d1504 (patch) | |
tree | 187144ec8bafd5099db53104f17f94e9a6db61c3 /libjava/java/security/AccessController.java | |
parent | 4fbecd29448860f20975d7aceecc14e843ef0eec (diff) | |
download | gcc-d2f108e266cd19172d664d433e772420e88d1504.zip gcc-d2f108e266cd19172d664d433e772420e88d1504.tar.gz gcc-d2f108e266cd19172d664d433e772420e88d1504.tar.bz2 |
Merge JDK 1.4 java.security changes from classpath.
* java/security/AccessControlException.java: Merge from Classpath.
* java/security/AccessController.java: Likewise.
* java/security/AllPermission.java: Likewise.
* java/security/BasicPermission.java: Likewise.
* java/security/Certificate.java: Likewise.
* java/security/CodeSource.java: Likewise.
* java/security/DigestException.java: Likewise.
* java/security/DigestOutputStream.java: Likewise.
* java/security/DomainCombiner.java: Likewise.
* java/security/GeneralSecurityException.java: Likewise.
* java/security/Guard.java: Likewise.
* java/security/GuardedObject.java: Likewise.
* java/security/InvalidAlgorithmParameterException.java: Likewise.
* java/security/InvalidKeyException.java: Likewise.
* java/security/InvalidParameterException.java: Likewise.
* java/security/Key.java: Likewise.
* java/security/KeyException.java: Likewise.
* java/security/KeyManagementException.java: Likewise.
* java/security/KeyStoreException.java: Likewise.
* java/security/MessageDigest.java: Likewise.
* java/security/NoSuchAlgorithmException.java: Likewise.
* java/security/NoSuchProviderException.java: Likewise.
* java/security/Permission.java: Likewise.
* java/security/PermissionCollection.java: Likewise.
* java/security/Permissions.java: Likewise.
* java/security/Policy.java: Likewise.
* java/security/Principal.java: Likewise.
* java/security/PrivateKey.java: Likewise.
* java/security/PrivilegedAction.java: Likewise.
* java/security/PrivilegedActionException.java: Likewise.
* java/security/PrivilegedExceptionAction.java: Likewise.
* java/security/ProtectionDomain.java: Likewise.
* java/security/ProviderException.java: Likewise.
* java/security/PublicKey.java: Likewise.
* java/security/SecureClassLoader.java: Likewise.
* java/security/SecurityPermission.java: Likewise.
* java/security/SignatureException.java: Likewise.
* java/security/UnrecoverableKeyException.java: Likewise.
* java/security/UnresolvedPermission.java: Likewise.
* java/security/acl/AclNotFoundException.java: Likewise.
* java/security/acl/LastOwnerException.java: Likewise.
* java/security/acl/NotOwnerException.java: Likewise.
* java/security/cert/CRLException.java: Likewise.
* java/security/cert/CertificateEncodingException.java: Likewise.
* java/security/cert/CertificateException.java: Likewise.
* java/security/cert/CertificateExpiredException.java: Likewise.
* java/security/cert/CertificateFactory.java: Likewise.
* java/security/cert/CertificateNotYetValidException.java: Likewise.
* java/security/cert/CertificateParsingException.java: Likewise.
* java/security/spec/InvalidKeySpecException.java: Likewise.
* java/security/spec/InvalidParameterSpecException.java: Likewise.
* java/security/cert/CertPath.java: New file.
* java/security/cert/CertPathBuilderException.java: New file.
* java/security/cert/CertPathValidatorException.java: New file.
* java/security/cert/CertStoreException.java: New file.
* Makefile.am: Add new CertPath classes.
* Makefile.in: Rebuilt.
* gnu/java/util/EmptyEnumeration: New file from classpath.
From-SVN: r53837
Diffstat (limited to 'libjava/java/security/AccessController.java')
-rw-r--r-- | libjava/java/security/AccessController.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libjava/java/security/AccessController.java b/libjava/java/security/AccessController.java index 2c6b557..41ca1ce 100644 --- a/libjava/java/security/AccessController.java +++ b/libjava/java/security/AccessController.java @@ -43,7 +43,7 @@ package java.security; * through the <code>checkPermission()</code> method. * Manipulates the access control context for code that needs to be executed * the protection domain of the calling class (by explicitly ignoring the - * context of the calling code) in the <code>doPriviliged()</code> methods. + * context of the calling code) in the <code>doPrivileged()</code> methods. * And provides a <code>getContext()</code> method which gives the access * control context of the current thread that can be used for checking * permissions at a later time and/or in another thread. @@ -131,7 +131,7 @@ public final class AccessController * @param action the <code>PrivilegedExceptionAction</code> whose * <code>run()</code> should be be called. * @returns the result of the <code>action.run()</code> method. - * @exception PriviligedActionException wrapped around any exception that + * @exception PrivilegedActionException wrapped around any exception that * is thrown in the <code>run()</code> method. */ public static Object doPrivileged(PrivilegedExceptionAction action) @@ -163,7 +163,7 @@ public final class AccessController * @param context the <code>AccessControlContext</code> whose protection * domains should be added to the protection domain of the calling class. * @returns the result of the <code>action.run()</code> method. - * @exception PriviligedActionException wrapped around any exception that + * @exception PrivilegedActionException wrapped around any exception that * is thrown in the <code>run()</code> method. */ public static Object doPrivileged(PrivilegedExceptionAction action, |