Attachment #29214 for bug #53701

View | Details | Raw Unified | Return to bug 53701
Collapse All | Expand All

Lines 105-111 Link Here

(-)java/javax/servlet/ServletInputStream.java (-1 lines)
105		105
106	/**	106	/**
107	* TODO SERVLET 3.1	107	* TODO SERVLET 3.1
108	* @return
109	*/	108	*/
110	public abstract void setReadListener(javax.servlet.ReadListener listener);	109	public abstract void setReadListener(javax.servlet.ReadListener listener);
111	}	110	}

Lines 282-287 Link Here

(-)java/javax/servlet/ServletOutputStream.java (-1 lines)
282		282
283	/**	283	/**
284	* TODO SERVLET 3.1	284	* TODO SERVLET 3.1
285	* @return
286	*/	285	*/
287	public abstract void setWriteListener(javax.servlet.WriteListener listener);}	286	public abstract void setWriteListener(javax.servlet.WriteListener listener);}

Lines 53-59 Link Here

(-)java/javax/servlet/jsp/JspException.java (-2 / +2 lines)
53	* <code>java.lang.Throwable.getCause()</code> and {@link #getRootCause()}	53	* <code>java.lang.Throwable.getCause()</code> and {@link #getRootCause()}
54	* methods.	54	* methods.
55	*	55	*
56	* @see <code>java.lang.Exception.Exception(String, Throwable)</code>	56	* @see java.lang.Exception#Exception(String, Throwable)
57	*	57	*
58	* @param message a <code>String</code> containing the text of the	58	* @param message a <code>String</code> containing the text of the
59	* exception message	59	* exception message
Lines 74-80 Link Here
74	* <code>java.lang.Throwable.getCause()</code> and {@link #getRootCause()}	74	* <code>java.lang.Throwable.getCause()</code> and {@link #getRootCause()}
75	* methods.	75	* methods.
76	*	76	*
77	* @see <code>java.lang.Exception.Exception(Throwable)</code>	77	* @see java.lang.Exception#Exception(Throwable)
78	*	78	*
79	* @param cause the <code>Throwable</code> exception that	79	* @param cause the <code>Throwable</code> exception that
80	* interfered with the JSP's normal operation, making	80	* interfered with the JSP's normal operation, making

Lines 31-37 Link Here

(-)java/org/apache/catalina/Executor.java (-1 / +1 lines)
31	* time until it throws a RejectedExecutionException	31	* time until it throws a RejectedExecutionException
32	*	32	*
33	* @param command the runnable task	33	* @param command the runnable task
34	* @throws org.apache.catalina.util.RejectedExecutionException if this task	34	* @throws java.util.concurrent.RejectedExecutionException if this task
35	* cannot be accepted for execution - the queue is full	35	* cannot be accepted for execution - the queue is full
36	* @throws NullPointerException if command or unit is null	36	* @throws NullPointerException if command or unit is null
37	*/	37	*/

Lines 64-70 Link Here

(-)java/org/apache/catalina/Manager.java (-2 / +2 lines)
64	*	64	*
65	* @param container The newly associated Container	65	* @param container The newly associated Container
66	*	66	*
67	* @deprecated Use {@link #setContext()}. This method will be removed in	67	* @deprecated Use {@link #setContext(Context)}. This method will be removed in
68	* Tomcat 9 onwards.	68	* Tomcat 9 onwards.
69	*/	69	*/
70	@Deprecated	70	@Deprecated
Lines 80-86 Link Here
80	/**	80	/**
81	* Set the Container with which this Manager is associated.	81	* Set the Container with which this Manager is associated.
82	*	82	*
83	* @param container The newly associated Context	83	* @param context The newly associated Context
84	*/	84	*/
85	public void setContext(Context context);	85	public void setContext(Context context);
86		86




     * 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[], 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[], java.io.Serializable, int, ErrorHandler)
     */
    public void handleCompletion(UniqueId id);





     * @param obj the object to bind; possibly null
     * @exception javax.naming.NameAlreadyBoundException if name is already
     * bound
     * @exception javax.naming.directory.InvalidAttributesException if object did not
     * supply all mandatory attributes
     * @exception NamingException if a naming exception is encountered
     */

     * @param obj the object to bind; possibly null
     * @exception javax.naming.NameAlreadyBoundException if name is already
     * bound
     * @exception javax.naming.directory.InvalidAttributesException if object did not
     * supply all mandatory attributes
     * @exception NamingException if a naming exception is encountered
     */

     *
     * @param name the name to bind; may not be empty
     * @param obj the object to bind; possibly null
     * @exception javax.naming.directory.InvalidAttributesException if object did not
     * supply all mandatory attributes
     * @exception NamingException if a naming exception is encountered
     */

     *
     * @param name the name to bind; may not be empty
     * @param obj the object to bind; possibly null
     * @exception javax.naming.directory.InvalidAttributesException if object did not
     * supply all mandatory attributes
     * @exception NamingException if a naming exception is encountered
     */

     * @return the newly created context
     * @exception javax.naming.NameAlreadyBoundException if name is already
     * bound
     * @exception javax.naming.directory.InvalidAttributesException if creation of the
     * sub-context requires specification of mandatory attributes
     * @exception NamingException if a naming exception is encountered
     */

     * @return the newly created context
     * @exception javax.naming.NameAlreadyBoundException if name is already
     * bound
     * @exception javax.naming.directory.InvalidAttributesException if creation of the
     * sub-context requires specification of mandatory attributes
     * @exception NamingException if a naming exception is encountered
     */

Lines 30-36 Link Here

(-)java/org/apache/tomcat/util/http/fileupload/FileItem.java (-1 / +1 lines)
30	* <p> After retrieving an instance of this class from a {@link	30	* <p> After retrieving an instance of this class from a {@link
31	* org.apache.tomcat.util.http.fileupload.FileUpload FileUpload} instance (see	31	* org.apache.tomcat.util.http.fileupload.FileUpload FileUpload} instance (see
32	* {@link org.apache.tomcat.util.http.fileupload.FileUpload	32	* {@link org.apache.tomcat.util.http.fileupload.FileUpload
33	* #parseRequest(javax.servlet.http.HttpServletRequest)}), you may	33	* #parseRequest(RequestContext)}), you may
34	* either request all contents of the file at once using {@link #get()} or	34	* either request all contents of the file at once using {@link #get()} or
35	* request an {@link java.io.InputStream InputStream} with	35	* request an {@link java.io.InputStream InputStream} with
36	* {@link #getInputStream()} and process the file without attempting to load	36	* {@link #getInputStream()} and process the file without attempting to load

Lines 37-45 Link Here

(-)webapps/examples/WEB-INF/classes/compressionFilters/CompressionResponseStream.java (-3 / +2 lines)
37	/**	37	/**
38	* Construct a servlet output stream associated with the specified Response.	38	* Construct a servlet output stream associated with the specified Response.
39	*	39	*
40	* @param response The associated response	40	* @param responseWrapper The associated response wrapper
41	* @param response	41	* @param originalOutput the output stream
42	* @param originalOutput
43	*/	42	*/
44	public CompressionResponseStream(	43	public CompressionResponseStream(
45	CompressionServletResponseWrapper responseWrapper,	44	CompressionServletResponseWrapper responseWrapper,

Return to bug 53701

Lines 32-45 Link Here

(-)java/org/apache/catalina/tribes/ErrorHandler.java (-2 / +2 lines)
32	* Invoked if the message is dispatched asynch, and an error occurs	32	* Invoked if the message is dispatched asynch, and an error occurs
33	* @param x ChannelException - the error that happened	33	* @param x ChannelException - the error that happened
34	* @param id - the unique id for the message	34	* @param id - the unique id for the message
35	* @see Channel#send(Member[], Serializable, int, ErrorHandler)	35	* @see Channel#send(Member[], java.io.Serializable, int, ErrorHandler)
36	*/	36	*/
37	public void handleError(ChannelException x, UniqueId id);	37	public void handleError(ChannelException x, UniqueId id);
38		38
39	/**	39	/**
40	* Invoked when the message has been sent successfully.	40	* Invoked when the message has been sent successfully.
41	* @param id - the unique id for the message	41	* @param id - the unique id for the message
42	* @see Channel#send(Member[], Serializable, int, ErrorHandler)	42	* @see Channel#send(Member[], java.io.Serializable, int, ErrorHandler)
43	*/	43	*/
44	public void handleCompletion(UniqueId id);	44	public void handleCompletion(UniqueId id);
45		45

Lines 169-175 Link Here

(-)java/org/apache/naming/SelectorContext.java (-6 / +6 lines)
169	* @param obj the object to bind; possibly null	169	* @param obj the object to bind; possibly null
170	* @exception javax.naming.NameAlreadyBoundException if name is already	170	* @exception javax.naming.NameAlreadyBoundException if name is already
171	* bound	171	* bound
172	* @exception javax.naming.InvalidAttributesException if object did not	172	* @exception javax.naming.directory.InvalidAttributesException if object did not
173	* supply all mandatory attributes	173	* supply all mandatory attributes
174	* @exception NamingException if a naming exception is encountered	174	* @exception NamingException if a naming exception is encountered
175	*/	175	*/
Lines 187-193 Link Here
187	* @param obj the object to bind; possibly null	187	* @param obj the object to bind; possibly null
188	* @exception javax.naming.NameAlreadyBoundException if name is already	188	* @exception javax.naming.NameAlreadyBoundException if name is already
189	* bound	189	* bound
190	* @exception javax.naming.InvalidAttributesException if object did not	190	* @exception javax.naming.directory.InvalidAttributesException if object did not
191	* supply all mandatory attributes	191	* supply all mandatory attributes
192	* @exception NamingException if a naming exception is encountered	192	* @exception NamingException if a naming exception is encountered
193	*/	193	*/
Lines 209-215 Link Here
209	*	209	*
210	* @param name the name to bind; may not be empty	210	* @param name the name to bind; may not be empty
211	* @param obj the object to bind; possibly null	211	* @param obj the object to bind; possibly null
212	* @exception javax.naming.InvalidAttributesException if object did not	212	* @exception javax.naming.directory.InvalidAttributesException if object did not
213	* supply all mandatory attributes	213	* supply all mandatory attributes
214	* @exception NamingException if a naming exception is encountered	214	* @exception NamingException if a naming exception is encountered
215	*/	215	*/
Lines 225-231 Link Here
225	*	225	*
226	* @param name the name to bind; may not be empty	226	* @param name the name to bind; may not be empty
227	* @param obj the object to bind; possibly null	227	* @param obj the object to bind; possibly null
228	* @exception javax.naming.InvalidAttributesException if object did not	228	* @exception javax.naming.directory.InvalidAttributesException if object did not
229	* supply all mandatory attributes	229	* supply all mandatory attributes
230	* @exception NamingException if a naming exception is encountered	230	* @exception NamingException if a naming exception is encountered
231	*/	231	*/
Lines 462-468 Link Here
462	* @return the newly created context	462	* @return the newly created context
463	* @exception javax.naming.NameAlreadyBoundException if name is already	463	* @exception javax.naming.NameAlreadyBoundException if name is already
464	* bound	464	* bound
465	* @exception javax.naming.InvalidAttributesException if creation of the	465	* @exception javax.naming.directory.InvalidAttributesException if creation of the
466	* sub-context requires specification of mandatory attributes	466	* sub-context requires specification of mandatory attributes
467	* @exception NamingException if a naming exception is encountered	467	* @exception NamingException if a naming exception is encountered
468	*/	468	*/
Lines 480-486 Link Here
480	* @return the newly created context	480	* @return the newly created context
481	* @exception javax.naming.NameAlreadyBoundException if name is already	481	* @exception javax.naming.NameAlreadyBoundException if name is already
482	* bound	482	* bound
483	* @exception javax.naming.InvalidAttributesException if creation of the	483	* @exception javax.naming.directory.InvalidAttributesException if creation of the
484	* sub-context requires specification of mandatory attributes	484	* sub-context requires specification of mandatory attributes
485	* @exception NamingException if a naming exception is encountered	485	* @exception NamingException if a naming exception is encountered
486	*/	486	*/