You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2012/08/14 20:14:42 UTC
svn commit: r1373003 - in /tomcat/trunk: java/javax/servlet/
java/javax/servlet/jsp/ java/org/apache/catalina/
java/org/apache/catalina/tribes/ java/org/apache/naming/
java/org/apache/tomcat/util/http/fileupload/
webapps/examples/WEB-INF/classes/compre...
Author: markt
Date: Tue Aug 14 18:14:42 2012
New Revision: 1373003
URL: http://svn.apache.org/viewvc?rev=1373003&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53701
Javadoc fixes provided by Sebb.
Modified:
tomcat/trunk/java/javax/servlet/ServletInputStream.java
tomcat/trunk/java/javax/servlet/ServletOutputStream.java
tomcat/trunk/java/javax/servlet/jsp/JspException.java
tomcat/trunk/java/org/apache/catalina/Executor.java
tomcat/trunk/java/org/apache/catalina/Manager.java
tomcat/trunk/java/org/apache/catalina/tribes/ErrorHandler.java
tomcat/trunk/java/org/apache/naming/SelectorContext.java
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileItem.java
tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionResponseStream.java
Modified: tomcat/trunk/java/javax/servlet/ServletInputStream.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/ServletInputStream.java?rev=1373003&r1=1373002&r2=1373003&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/ServletInputStream.java (original)
+++ tomcat/trunk/java/javax/servlet/ServletInputStream.java Tue Aug 14 18:14:42 2012
@@ -105,7 +105,6 @@ public abstract class ServletInputStream
/**
* TODO SERVLET 3.1
- * @return
*/
public abstract void setReadListener(javax.servlet.ReadListener listener);
}
Modified: tomcat/trunk/java/javax/servlet/ServletOutputStream.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/ServletOutputStream.java?rev=1373003&r1=1373002&r2=1373003&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/ServletOutputStream.java (original)
+++ tomcat/trunk/java/javax/servlet/ServletOutputStream.java Tue Aug 14 18:14:42 2012
@@ -282,6 +282,5 @@ public abstract class ServletOutputStrea
/**
* TODO SERVLET 3.1
- * @return
*/
public abstract void setWriteListener(javax.servlet.WriteListener listener);}
Modified: tomcat/trunk/java/javax/servlet/jsp/JspException.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/JspException.java?rev=1373003&r1=1373002&r2=1373003&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/jsp/JspException.java (original)
+++ tomcat/trunk/java/javax/servlet/jsp/JspException.java Tue Aug 14 18:14:42 2012
@@ -53,7 +53,7 @@ public class JspException extends Except
* <code>java.lang.Throwable.getCause()</code> and {@link #getRootCause()}
* methods.
*
- * @see <code>java.lang.Exception.Exception(String, Throwable)</code>
+ * @see java.lang.Exception#Exception(String, Throwable)
*
* @param message a <code>String</code> containing the text of the
* exception message
@@ -74,7 +74,7 @@ public class JspException extends Except
* <code>java.lang.Throwable.getCause()</code> and {@link #getRootCause()}
* methods.
*
- * @see <code>java.lang.Exception.Exception(Throwable)</code>
+ * @see java.lang.Exception#Exception(Throwable)
*
* @param cause the <code>Throwable</code> exception that
* interfered with the JSP's normal operation, making
Modified: tomcat/trunk/java/org/apache/catalina/Executor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Executor.java?rev=1373003&r1=1373002&r2=1373003&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/Executor.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Executor.java Tue Aug 14 18:14:42 2012
@@ -31,7 +31,7 @@ public interface Executor extends java.u
* 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
*/
Modified: tomcat/trunk/java/org/apache/catalina/Manager.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Manager.java?rev=1373003&r1=1373002&r2=1373003&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/Manager.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Manager.java Tue Aug 14 18:14:42 2012
@@ -64,7 +64,7 @@ public interface Manager {
*
* @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 @@ public interface Manager {
/**
* 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);
Modified: tomcat/trunk/java/org/apache/catalina/tribes/ErrorHandler.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/ErrorHandler.java?rev=1373003&r1=1373002&r2=1373003&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/ErrorHandler.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/ErrorHandler.java Tue Aug 14 18:14:42 2012
@@ -32,14 +32,14 @@ public interface ErrorHandler {
* 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);
Modified: tomcat/trunk/java/org/apache/naming/SelectorContext.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/SelectorContext.java?rev=1373003&r1=1373002&r2=1373003&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/SelectorContext.java (original)
+++ tomcat/trunk/java/org/apache/naming/SelectorContext.java Tue Aug 14 18:14:42 2012
@@ -169,7 +169,7 @@ public class SelectorContext implements
* @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 @@ public class SelectorContext implements
* @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 @@ public class SelectorContext implements
*
* @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 @@ public class SelectorContext implements
*
* @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 @@ public class SelectorContext implements
* @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 @@ public class SelectorContext implements
* @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
*/
Modified: tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileItem.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileItem.java?rev=1373003&r1=1373002&r2=1373003&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileItem.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileItem.java Tue Aug 14 18:14:42 2012
@@ -30,7 +30,7 @@ import java.io.UnsupportedEncodingExcept
* <p> 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
Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionResponseStream.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionResponseStream.java?rev=1373003&r1=1373002&r2=1373003&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionResponseStream.java (original)
+++ tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionResponseStream.java Tue Aug 14 18:14:42 2012
@@ -37,9 +37,8 @@ public class CompressionResponseStream e
/**
* 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,
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org