Index: java/javax/servlet/ServletInputStream.java =================================================================== --- java/javax/servlet/ServletInputStream.java (revision 1362327) +++ java/javax/servlet/ServletInputStream.java (working copy) @@ -105,7 +105,6 @@ /** * TODO SERVLET 3.1 - * @return */ public abstract void setReadListener(javax.servlet.ReadListener listener); } Index: java/javax/servlet/ServletOutputStream.java =================================================================== --- java/javax/servlet/ServletOutputStream.java (revision 1362327) +++ java/javax/servlet/ServletOutputStream.java (working copy) @@ -282,6 +282,5 @@ /** * TODO SERVLET 3.1 - * @return */ public abstract void setWriteListener(javax.servlet.WriteListener listener);} Index: java/javax/servlet/jsp/JspException.java =================================================================== --- java/javax/servlet/jsp/JspException.java (revision 1362327) +++ java/javax/servlet/jsp/JspException.java (working copy) @@ -53,7 +53,7 @@ * java.lang.Throwable.getCause() and {@link #getRootCause()} * methods. * - * @see java.lang.Exception.Exception(String, Throwable) + * @see java.lang.Exception#Exception(String, Throwable) * * @param message a String containing the text of the * exception message @@ -74,7 +74,7 @@ * java.lang.Throwable.getCause() and {@link #getRootCause()} * methods. * - * @see java.lang.Exception.Exception(Throwable) + * @see java.lang.Exception#Exception(Throwable) * * @param cause the Throwable exception that * interfered with the JSP's normal operation, making Index: java/org/apache/catalina/Executor.java =================================================================== --- java/org/apache/catalina/Executor.java (revision 1369161) +++ java/org/apache/catalina/Executor.java (working copy) @@ -31,7 +31,7 @@ * time until it throws a RejectedExecutionException * * @param command the runnable task - * @throws org.apache.catalina.util.RejectedExecutionException if this task + * @throws java.util.concurrent.RejectedExecutionException if this task * cannot be accepted for execution - the queue is full * @throws NullPointerException if command or unit is null */ Index: java/org/apache/catalina/Manager.java =================================================================== --- java/org/apache/catalina/Manager.java (revision 1369161) +++ java/org/apache/catalina/Manager.java (working copy) @@ -64,7 +64,7 @@ * * @param container The newly associated Container * - * @deprecated Use {@link #setContext()}. This method will be removed in + * @deprecated Use {@link #setContext(Context)}. This method will be removed in * Tomcat 9 onwards. */ @Deprecated @@ -80,7 +80,7 @@ /** * Set the Container with which this Manager is associated. * - * @param container The newly associated Context + * @param context The newly associated Context */ public void setContext(Context context); Index: java/org/apache/catalina/tribes/ErrorHandler.java =================================================================== --- java/org/apache/catalina/tribes/ErrorHandler.java (revision 1369161) +++ java/org/apache/catalina/tribes/ErrorHandler.java (working copy) @@ -32,14 +32,14 @@ * Invoked if the message is dispatched asynch, and an error occurs * @param x ChannelException - the error that happened * @param id - the unique id for the message - * @see Channel#send(Member[], Serializable, int, ErrorHandler) + * @see Channel#send(Member[], java.io.Serializable, int, ErrorHandler) */ public void handleError(ChannelException x, UniqueId id); /** * Invoked when the message has been sent successfully. * @param id - the unique id for the message - * @see Channel#send(Member[], Serializable, int, ErrorHandler) + * @see Channel#send(Member[], java.io.Serializable, int, ErrorHandler) */ public void handleCompletion(UniqueId id); Index: java/org/apache/naming/SelectorContext.java =================================================================== --- java/org/apache/naming/SelectorContext.java (revision 1362327) +++ java/org/apache/naming/SelectorContext.java (working copy) @@ -169,7 +169,7 @@ * @param obj the object to bind; possibly null * @exception javax.naming.NameAlreadyBoundException if name is already * bound - * @exception javax.naming.InvalidAttributesException if object did not + * @exception javax.naming.directory.InvalidAttributesException if object did not * supply all mandatory attributes * @exception NamingException if a naming exception is encountered */ @@ -187,7 +187,7 @@ * @param obj the object to bind; possibly null * @exception javax.naming.NameAlreadyBoundException if name is already * bound - * @exception javax.naming.InvalidAttributesException if object did not + * @exception javax.naming.directory.InvalidAttributesException if object did not * supply all mandatory attributes * @exception NamingException if a naming exception is encountered */ @@ -209,7 +209,7 @@ * * @param name the name to bind; may not be empty * @param obj the object to bind; possibly null - * @exception javax.naming.InvalidAttributesException if object did not + * @exception javax.naming.directory.InvalidAttributesException if object did not * supply all mandatory attributes * @exception NamingException if a naming exception is encountered */ @@ -225,7 +225,7 @@ * * @param name the name to bind; may not be empty * @param obj the object to bind; possibly null - * @exception javax.naming.InvalidAttributesException if object did not + * @exception javax.naming.directory.InvalidAttributesException if object did not * supply all mandatory attributes * @exception NamingException if a naming exception is encountered */ @@ -462,7 +462,7 @@ * @return the newly created context * @exception javax.naming.NameAlreadyBoundException if name is already * bound - * @exception javax.naming.InvalidAttributesException if creation of the + * @exception javax.naming.directory.InvalidAttributesException if creation of the * sub-context requires specification of mandatory attributes * @exception NamingException if a naming exception is encountered */ @@ -480,7 +480,7 @@ * @return the newly created context * @exception javax.naming.NameAlreadyBoundException if name is already * bound - * @exception javax.naming.InvalidAttributesException if creation of the + * @exception javax.naming.directory.InvalidAttributesException if creation of the * sub-context requires specification of mandatory attributes * @exception NamingException if a naming exception is encountered */ Index: java/org/apache/tomcat/util/http/fileupload/FileItem.java =================================================================== --- java/org/apache/tomcat/util/http/fileupload/FileItem.java (revision 1362327) +++ java/org/apache/tomcat/util/http/fileupload/FileItem.java (working copy) @@ -30,7 +30,7 @@ *

After retrieving an instance of this class from a {@link * org.apache.tomcat.util.http.fileupload.FileUpload FileUpload} instance (see * {@link org.apache.tomcat.util.http.fileupload.FileUpload - * #parseRequest(javax.servlet.http.HttpServletRequest)}), you may + * #parseRequest(RequestContext)}), you may * either request all contents of the file at once using {@link #get()} or * request an {@link java.io.InputStream InputStream} with * {@link #getInputStream()} and process the file without attempting to load Index: webapps/examples/WEB-INF/classes/compressionFilters/CompressionResponseStream.java =================================================================== --- webapps/examples/WEB-INF/classes/compressionFilters/CompressionResponseStream.java (revision 1362327) +++ webapps/examples/WEB-INF/classes/compressionFilters/CompressionResponseStream.java (working copy) @@ -37,9 +37,8 @@ /** * Construct a servlet output stream associated with the specified Response. * - * @param response The associated response - * @param response - * @param originalOutput + * @param responseWrapper The associated response wrapper + * @param originalOutput the output stream */ public CompressionResponseStream( CompressionServletResponseWrapper responseWrapper,