# HG changeset patch # User tbell # Date 1233386840 28800 # Node ID d3de53b2070d2aa73436d5526a3ae0181da3f640 # Parent 7e90efb5bee6856ed2014e4eb9ba0f7fbcdd5dd7# Parent bdfd8f01987a629db28ed5018de072ece3747036 Merge diff -r 7e90efb5bee6 -r d3de53b2070d jdk/src/share/classes/java/io/InputStream.java --- a/jdk/src/share/classes/java/io/InputStream.java Thu Jan 29 21:46:48 2009 -0800 +++ b/jdk/src/share/classes/java/io/InputStream.java Fri Jan 30 23:27:20 2009 -0800 @@ -90,7 +90,7 @@ * * @param b the buffer into which the data is read. * @return the total number of bytes read into the buffer, or - * -1 is there is no more data because the end of + * -1 if there is no more data because the end of * the stream has been reached. * @exception IOException If the first byte cannot be read for any reason * other than the end of the file, if the input stream has been closed, or diff -r 7e90efb5bee6 -r d3de53b2070d jdk/src/share/classes/java/lang/Enum.java --- a/jdk/src/share/classes/java/lang/Enum.java Thu Jan 29 21:46:48 2009 -0800 +++ b/jdk/src/share/classes/java/lang/Enum.java Fri Jan 30 23:27:20 2009 -0800 @@ -1,5 +1,5 @@ /* - * Copyright 2003-2007 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2003-2009 Sun Microsystems, Inc. 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 @@ -34,6 +34,11 @@ /** * This is the common base class of all Java language enumeration types. * + * More information about enums, including implicit methods synthesised + * by the compiler, can be found in The Java™ Language + * Specification, Third Edition, §8.9. + * * @author Josh Bloch * @author Neal Gafter * @see Class#getEnumConstants() @@ -212,7 +217,7 @@ if (name == null) throw new NullPointerException("Name is null"); throw new IllegalArgumentException( - "No enum const " + enumType +"." + name); + "No enum constant " + enumType.getCanonicalName() + "." + name); } /** @@ -225,10 +230,10 @@ */ private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException { - throw new InvalidObjectException("can't deserialize enum"); + throw new InvalidObjectException("can't deserialize enum"); } private void readObjectNoData() throws ObjectStreamException { - throw new InvalidObjectException("can't deserialize enum"); + throw new InvalidObjectException("can't deserialize enum"); } } diff -r 7e90efb5bee6 -r d3de53b2070d jdk/src/share/classes/java/lang/Object.java --- a/jdk/src/share/classes/java/lang/Object.java Thu Jan 29 21:46:48 2009 -0800 +++ b/jdk/src/share/classes/java/lang/Object.java Fri Jan 30 23:27:20 2009 -0800 @@ -26,8 +26,8 @@ package java.lang; /** - * Class Object is the root of the class hierarchy. - * Every class has Object as a superclass. All objects, + * Class {@code Object} is the root of the class hierarchy. + * Every class has {@code Object} as a superclass. All objects, * including arrays, implement the methods of this class. * * @author unascribed @@ -66,30 +66,30 @@ /** * Returns a hash code value for the object. This method is - * supported for the benefit of hashtables such as those provided by - * java.util.Hashtable. + * supported for the benefit of hash tables such as those provided by + * {@link java.util.HashMap}. *

- * The general contract of hashCode is: + * The general contract of {@code hashCode} is: *

*

* As much as is reasonably practical, the hashCode method defined by - * class Object does return distinct integers for distinct + * class {@code Object} does return distinct integers for distinct * objects. (This is typically implemented by converting the internal * address of the object into an integer, but this implementation * technique is not required by the @@ -97,55 +97,55 @@ * * @return a hash code value for this object. * @see java.lang.Object#equals(java.lang.Object) - * @see java.util.Hashtable + * @see java.lang.System#identityHashCode */ public native int hashCode(); /** * Indicates whether some other object is "equal to" this one. *

- * The equals method implements an equivalence relation + * The {@code equals} method implements an equivalence relation * on non-null object references: *

*

- * The equals method for class Object implements + * The {@code equals} method for class {@code Object} implements * the most discriminating possible equivalence relation on objects; - * that is, for any non-null reference values x and - * y, this method returns true if and only - * if x and y refer to the same object - * (x == y has the value true). + * that is, for any non-null reference values {@code x} and + * {@code y}, this method returns {@code true} if and only + * if {@code x} and {@code y} refer to the same object + * ({@code x == y} has the value {@code true}). *

- * Note that it is generally necessary to override the hashCode + * Note that it is generally necessary to override the {@code hashCode} * method whenever this method is overridden, so as to maintain the - * general contract for the hashCode method, which states + * general contract for the {@code hashCode} method, which states * that equal objects must have equal hash codes. * * @param obj the reference object with which to compare. - * @return true if this object is the same as the obj - * argument; false otherwise. + * @return {@code true} if this object is the same as the obj + * argument; {@code false} otherwise. * @see #hashCode() - * @see java.util.Hashtable + * @see java.util.HashMap */ public boolean equals(Object obj) { return (this == obj); @@ -154,7 +154,7 @@ /** * Creates and returns a copy of this object. The precise meaning * of "copy" may depend on the class of the object. The general - * intent is that, for any object x, the expression: + * intent is that, for any object {@code x}, the expression: *

*
      * x.clone() != x
@@ -162,49 +162,49 @@ *
*
      * x.clone().getClass() == x.getClass()
- * will be true, but these are not absolute requirements. + * will be {@code true}, but these are not absolute requirements. * While it is typically the case that: *
*
      * x.clone().equals(x)
- * will be true, this is not an absolute requirement. + * will be {@code true}, this is not an absolute requirement. *

* By convention, the returned object should be obtained by calling - * super.clone. If a class and all of its superclasses (except - * Object) obey this convention, it will be the case that - * x.clone().getClass() == x.getClass(). + * {@code super.clone}. If a class and all of its superclasses (except + * {@code Object}) obey this convention, it will be the case that + * {@code x.clone().getClass() == x.getClass()}. *

* By convention, the object returned by this method should be independent * of this object (which is being cloned). To achieve this independence, * it may be necessary to modify one or more fields of the object returned - * by super.clone before returning it. Typically, this means + * by {@code super.clone} before returning it. Typically, this means * copying any mutable objects that comprise the internal "deep structure" * of the object being cloned and replacing the references to these * objects with references to the copies. If a class contains only * primitive fields or references to immutable objects, then it is usually - * the case that no fields in the object returned by super.clone + * the case that no fields in the object returned by {@code super.clone} * need to be modified. *

- * The method clone for class Object performs a + * The method {@code clone} for class {@code Object} performs a * specific cloning operation. First, if the class of this object does - * not implement the interface Cloneable, then a - * CloneNotSupportedException is thrown. Note that all arrays - * are considered to implement the interface Cloneable. + * not implement the interface {@code Cloneable}, then a + * {@code CloneNotSupportedException} is thrown. Note that all arrays + * are considered to implement the interface {@code Cloneable}. * Otherwise, this method creates a new instance of the class of this * object and initializes all its fields with exactly the contents of * the corresponding fields of this object, as if by assignment; the * contents of the fields are not themselves cloned. Thus, this method * performs a "shallow copy" of this object, not a "deep copy" operation. *

- * The class Object does not itself implement the interface - * Cloneable, so calling the clone method on an object - * whose class is Object will result in throwing an + * The class {@code Object} does not itself implement the interface + * {@code Cloneable}, so calling the {@code clone} method on an object + * whose class is {@code Object} will result in throwing an * exception at run time. * * @return a clone of this instance. * @exception CloneNotSupportedException if the object's class does not - * support the Cloneable interface. Subclasses - * that override the clone method can also + * support the {@code Cloneable} interface. Subclasses + * that override the {@code clone} method can also * throw this exception to indicate that an instance cannot * be cloned. * @see java.lang.Cloneable @@ -213,15 +213,15 @@ /** * Returns a string representation of the object. In general, the - * toString method returns a string that + * {@code toString} method returns a string that * "textually represents" this object. The result should * be a concise but informative representation that is easy for a * person to read. * It is recommended that all subclasses override this method. *

- * The toString method for class Object + * The {@code toString} method for class {@code Object} * returns a string consisting of the name of the class of which the - * object is an instance, the at-sign character `@', and + * object is an instance, the at-sign character `{@code @}', and * the unsigned hexadecimal representation of the hash code of the * object. In other words, this method returns a string equal to the * value of: @@ -241,7 +241,7 @@ * monitor. If any threads are waiting on this object, one of them * is chosen to be awakened. The choice is arbitrary and occurs at * the discretion of the implementation. A thread waits on an object's - * monitor by calling one of the wait methods. + * monitor by calling one of the {@code wait} methods. *

* The awakened thread will not be able to proceed until the current * thread relinquishes the lock on this object. The awakened thread will @@ -255,9 +255,9 @@ * object's monitor in one of three ways: *

*

@@ -273,7 +273,7 @@ /** * Wakes up all threads that are waiting on this object's monitor. A * thread waits on an object's monitor by calling one of the - * wait methods. + * {@code wait} methods. *

* The awakened threads will not be able to proceed until the current * thread relinquishes the lock on this object. The awakened threads @@ -283,7 +283,7 @@ * being the next thread to lock this object. *

* This method should only be called by a thread that is the owner - * of this object's monitor. See the notify method for a + * of this object's monitor. See the {@code notify} method for a * description of the ways in which a thread can become the owner of * a monitor. * @@ -308,15 +308,15 @@ * becomes disabled for thread scheduling purposes and lies dormant * until one of four things happens: *

* The thread T is then removed from the wait set for this @@ -324,11 +324,11 @@ * usual manner with other threads for the right to synchronize on the * object; once it has gained control of the object, all its * synchronization claims on the object are restored to the status quo - * ante - that is, to the situation as of the time that the wait + * ante - that is, to the situation as of the time that the {@code wait} * method was invoked. Thread T then returns from the - * invocation of the wait method. Thus, on return from the - * wait method, the synchronization state of the object and of - * thread T is exactly as it was when the wait method + * invocation of the {@code wait} method. Thus, on return from the + * {@code wait} method, the synchronization state of the object and of + * thread {@code T} is exactly as it was when the {@code wait} method * was invoked. *

* A thread can also wake up without being notified, interrupted, or @@ -351,18 +351,18 @@ * *

If the current thread is {@linkplain java.lang.Thread#interrupt() * interrupted} by any thread before or while it is waiting, then an - * InterruptedException is thrown. This exception is not + * {@code InterruptedException} is thrown. This exception is not * thrown until the lock status of this object has been restored as * described above. * *

- * Note that the wait method, as it places the current thread + * Note that the {@code wait} method, as it places the current thread * into the wait set for this object, unlocks only this object; any * other objects on which the current thread may be synchronized remain * locked while the thread waits. *

* This method should only be called by a thread that is the owner - * of this object's monitor. See the notify method for a + * of this object's monitor. See the {@code notify} method for a * description of the ways in which a thread can become the owner of * a monitor. * @@ -388,7 +388,7 @@ * some other thread interrupts the current thread, or a certain * amount of real time has elapsed. *

- * This method is similar to the wait method of one + * This method is similar to the {@code wait} method of one * argument, but it allows finer control over the amount of time to * wait for a notification before giving up. The amount of real time, * measured in nanoseconds, is given by: @@ -398,17 +398,17 @@ *

* In all other respects, this method does the same thing as the * method {@link #wait(long)} of one argument. In particular, - * wait(0, 0) means the same thing as wait(0). + * {@code wait(0, 0)} means the same thing as {@code wait(0)}. *

* The current thread must own this object's monitor. The thread * releases ownership of this monitor and waits until either of the * following two conditions has occurred: *

*

@@ -425,7 +425,7 @@ * } * * This method should only be called by a thread that is the owner - * of this object's monitor. See the notify method for a + * of this object's monitor. See the {@code notify} method for a * description of the ways in which a thread can become the owner of * a monitor. * @@ -465,13 +465,13 @@ * {@link java.lang.Object#notify()} method or the * {@link java.lang.Object#notifyAll()} method for this object. * In other words, this method behaves exactly as if it simply - * performs the call wait(0). + * performs the call {@code wait(0)}. *

* The current thread must own this object's monitor. The thread * releases ownership of this monitor and waits until another thread * notifies threads waiting on this object's monitor to wake up - * either through a call to the notify method or the - * notifyAll method. The thread then waits until it can + * either through a call to the {@code notify} method or the + * {@code notifyAll} method. The thread then waits until it can * re-obtain ownership of the monitor and resumes execution. *

* As in the one argument version, interrupts and spurious wakeups are @@ -484,7 +484,7 @@ * } * * This method should only be called by a thread that is the owner - * of this object's monitor. See the notify method for a + * of this object's monitor. See the {@code notify} method for a * description of the ways in which a thread can become the owner of * a monitor. * @@ -505,49 +505,49 @@ /** * Called by the garbage collector on an object when garbage collection * determines that there are no more references to the object. - * A subclass overrides the finalize method to dispose of + * A subclass overrides the {@code finalize} method to dispose of * system resources or to perform other cleanup. *

- * The general contract of finalize is that it is invoked + * The general contract of {@code finalize} is that it is invoked * if and when the JavaTM virtual * machine has determined that there is no longer any * means by which this object can be accessed by any thread that has * not yet died, except as a result of an action taken by the * finalization of some other object or class which is ready to be - * finalized. The finalize method may take any action, including + * finalized. The {@code finalize} method may take any action, including * making this object available again to other threads; the usual purpose - * of finalize, however, is to perform cleanup actions before + * of {@code finalize}, however, is to perform cleanup actions before * the object is irrevocably discarded. For example, the finalize method * for an object that represents an input/output connection might perform * explicit I/O transactions to break the connection before the object is * permanently discarded. *

- * The finalize method of class Object performs no + * The {@code finalize} method of class {@code Object} performs no * special action; it simply returns normally. Subclasses of - * Object may override this definition. + * {@code Object} may override this definition. *

* The Java programming language does not guarantee which thread will - * invoke the finalize method for any given object. It is + * invoke the {@code finalize} method for any given object. It is * guaranteed, however, that the thread that invokes finalize will not * be holding any user-visible synchronization locks when finalize is * invoked. If an uncaught exception is thrown by the finalize method, * the exception is ignored and finalization of that object terminates. *

- * After the finalize method has been invoked for an object, no + * After the {@code finalize} method has been invoked for an object, no * further action is taken until the Java virtual machine has again * determined that there is no longer any means by which this object can * be accessed by any thread that has not yet died, including possible * actions by other objects or classes which are ready to be finalized, * at which point the object may be discarded. *

- * The finalize method is never invoked more than once by a Java + * The {@code finalize} method is never invoked more than once by a Java * virtual machine for any given object. *

- * Any exception thrown by the finalize method causes + * Any exception thrown by the {@code finalize} method causes * the finalization of this object to be halted, but is otherwise * ignored. * - * @throws Throwable the Exception raised by this method + * @throws Throwable the {@code Exception} raised by this method */ protected void finalize() throws Throwable { } } diff -r 7e90efb5bee6 -r d3de53b2070d jdk/src/share/classes/java/lang/RuntimePermission.java --- a/jdk/src/share/classes/java/lang/RuntimePermission.java Thu Jan 29 21:46:48 2009 -0800 +++ b/jdk/src/share/classes/java/lang/RuntimePermission.java Fri Jan 30 23:27:20 2009 -0800 @@ -100,6 +100,13 @@ * * * + * closeClassLoader + * Closing of a ClassLoader + * Granting this permission allows code to close any URLClassLoader + * that it has a reference to. + * + * + * * setSecurityManager * Setting of the security manager (possibly replacing an existing one) * diff -r 7e90efb5bee6 -r d3de53b2070d jdk/src/share/classes/java/lang/annotation/Annotation.java --- a/jdk/src/share/classes/java/lang/annotation/Annotation.java Thu Jan 29 21:46:48 2009 -0800 +++ b/jdk/src/share/classes/java/lang/annotation/Annotation.java Fri Jan 30 23:27:20 2009 -0800 @@ -1,5 +1,5 @@ /* - * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2003-2009 Sun Microsystems, Inc. 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 @@ -31,6 +31,10 @@ * an annotation type. Also note that this interface does not itself * define an annotation type. * + * More information about annotation types can be found in The + * Java™ Language Specification, Third Edition, §9.6. + * * @author Josh Bloch * @since 1.5 */ diff -r 7e90efb5bee6 -r d3de53b2070d jdk/src/share/classes/java/lang/instrument/package.html --- a/jdk/src/share/classes/java/lang/instrument/package.html Thu Jan 29 21:46:48 2009 -0800 +++ b/jdk/src/share/classes/java/lang/instrument/package.html Fri Jan 30 23:27:20 2009 -0800 @@ -1,3 +1,28 @@ + + diff -r 7e90efb5bee6 -r d3de53b2070d jdk/src/share/classes/java/net/HttpCookie.java --- a/jdk/src/share/classes/java/net/HttpCookie.java Thu Jan 29 21:46:48 2009 -0800 +++ b/jdk/src/share/classes/java/net/HttpCookie.java Fri Jan 30 23:27:20 2009 -0800 @@ -1058,8 +1058,7 @@ if (assignor != null) { assignor.assign(cookie, attrName, attrValue); } else { - // must be an error - throw new IllegalArgumentException("Illegal cookie attribute"); + // Ignore the attribute as per RFC 2965 } } diff -r 7e90efb5bee6 -r d3de53b2070d jdk/src/share/classes/java/net/URLClassLoader.java --- a/jdk/src/share/classes/java/net/URLClassLoader.java Thu Jan 29 21:46:48 2009 -0800 +++ b/jdk/src/share/classes/java/net/URLClassLoader.java Fri Jan 30 23:27:20 2009 -0800 @@ -31,10 +31,12 @@ import java.io.FilePermission; import java.io.InputStream; import java.io.IOException; +import java.io.Closeable; import java.net.URL; import java.net.URLConnection; import java.net.URLStreamHandlerFactory; import java.util.Enumeration; +import java.util.List; import java.util.NoSuchElementException; import java.util.StringTokenizer; import java.util.jar.Manifest; @@ -70,7 +72,7 @@ * @author David Connelly * @since 1.2 */ -public class URLClassLoader extends SecureClassLoader { +public class URLClassLoader extends SecureClassLoader implements Closeable { /* The search path for classes and resources */ URLClassPath ucp; @@ -85,13 +87,13 @@ * to refer to a JAR file which will be downloaded and opened as needed. * *

If there is a security manager, this method first - * calls the security manager's checkCreateClassLoader method + * calls the security manager's {@code checkCreateClassLoader} method * to ensure creation of a class loader is allowed. * * @param urls the URLs from which to load classes and resources * @param parent the parent class loader for delegation * @exception SecurityException if a security manager exists and its - * checkCreateClassLoader method doesn't allow + * {@code checkCreateClassLoader} method doesn't allow * creation of a class loader. * @see SecurityManager#checkCreateClassLoader */ @@ -169,12 +171,65 @@ acc = AccessController.getContext(); } + + /** + * Closes this URLClassLoader, so that it can no longer be used to load + * new classes or resources that are defined by this loader. + * Classes and resources defined by any of this loader's parents in the + * delegation hierarchy are still accessible. Also, any classes or resources + * that are already loaded, are still accessible. + *

+ * In the case of jar: and file: URLs, it also closes any class files, + * or JAR files that were opened by it. If another thread is loading a + * class when the {@code close} method is invoked, then the result of + * that load is undefined. + *

+ * The method makes a best effort attempt to close all opened files, + * by catching {@link IOException}s internally. Unchecked exceptions + * and errors are not caught. Calling close on an already closed + * loader has no effect. + *

+ * @throws IOException if closing any file opened by this class loader + * resulted in an IOException. Any such exceptions are caught, and a + * single IOException is thrown after the last file has been closed. + * If only one exception was thrown, it will be set as the cause + * of this IOException. + * + * @throws SecurityException if a security manager is set, and it denies + * {@link RuntimePermission}("closeClassLoader") + * + * @since 1.7 + */ + public void close() throws IOException { + SecurityManager security = System.getSecurityManager(); + if (security != null) { + security.checkPermission(new RuntimePermission("closeClassLoader")); + } + List errors = ucp.closeLoaders(); + if (errors.isEmpty()) { + return; + } + if (errors.size() == 1) { + throw new IOException ( + "Error closing URLClassLoader resource", + errors.get(0) + ); + } + // Several exceptions. So, just combine the error messages + String errormsg = "Error closing resources: "; + for (IOException error: errors) { + errormsg = errormsg + "[" + error.toString() + "] "; + } + throw new IOException (errormsg); + } + /** * Appends the specified URL to the list of URLs to search for * classes and resources. *

* If the URL specified is null or is already in the - * list of URLs, then invoking this method has no effect. + * list of URLs, or if this loader is closed, then invoking this + * method has no effect. * * @param url the URL to be added to the search path of URLs */ @@ -199,7 +254,8 @@ * * @param name the name of the class * @return the resulting class - * @exception ClassNotFoundException if the class could not be found + * @exception ClassNotFoundException if the class could not be found, + * or if the loader is closed. */ protected Class findClass(final String name) throws ClassNotFoundException @@ -370,7 +426,7 @@ * * @param name the name of the resource * @return a URL for the resource, or null - * if the resource could not be found. + * if the resource could not be found, or if the loader is closed. */ public URL findResource(final String name) { /* @@ -393,6 +449,7 @@ * @param name the resource name * @exception IOException if an I/O exception occurs * @return an Enumeration of URLs + * If the loader is closed, the Enumeration will be empty. */ public Enumeration findResources(final String name) throws IOException diff -r 7e90efb5bee6 -r d3de53b2070d jdk/src/share/classes/java/util/Formatter.java --- a/jdk/src/share/classes/java/util/Formatter.java Thu Jan 29 21:46:48 2009 -0800 +++ b/jdk/src/share/classes/java/util/Formatter.java Fri Jan 30 23:27:20 2009 -0800 @@ -59,7 +59,7 @@ * An interpreter for printf-style format strings. This class provides support * for layout justification and alignment, common formats for numeric, string, * and date/time data, and locale-specific output. Common Java types such as - * byte, {@link java.math.BigDecimal BigDecimal}, and {@link Calendar} + * {@code byte}, {@link java.math.BigDecimal BigDecimal}, and {@link Calendar} * are supported. Limited formatting customization for arbitrary user types is * provided through the {@link Formattable} interface. * @@ -68,7 +68,7 @@ * class. * *

Formatted printing for the Java language is heavily inspired by C's - * printf. Although the format strings are similar to C, some + * {@code printf}. Although the format strings are similar to C, some * customizations have been made to accommodate the Java language and exploit * some of its features. Also, Java formatting is more strict than C's; for * example, if a conversion is incompatible with a flag, an exception will be @@ -115,7 +115,7 @@ * // -> "Unable to open file 'food': No such file or directory" * * - *

Like C's sprintf(3), Strings may be formatted using the static + *

Like C's {@code sprintf(3)}, Strings may be formatted using the static * method {@link String#format(String,Object...) String.format}: * *

@@ -157,16 +157,16 @@
  *   String s = String.format("Duke's Birthday: %1$tm %1$te,%1$tY", c);
  * 
* - * This format string is the first argument to the format method. It - * contains three format specifiers "%1$tm", "%1$te", and - * "%1$tY" which indicate how the arguments should be processed and + * This format string is the first argument to the {@code format} method. It + * contains three format specifiers "{@code %1$tm}", "{@code %1$te}", and + * "{@code %1$tY}" which indicate how the arguments should be processed and * where they should be inserted in the text. The remaining portions of the - * format string are fixed text including "Dukes Birthday: " and any + * format string are fixed text including {@code "Dukes Birthday: "} and any * other spaces or punctuation. * * The argument list consists of all arguments passed to the method after the * format string. In the above example, the argument list is of size one and - * consists of the {@link java.util.Calendar Calendar} object c. + * consists of the {@link java.util.Calendar Calendar} object {@code c}. * *