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 2019/07/22 10:02:17 UTC

[tomcat] branch 7.0.x updated: Polish. Fix indent.

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/7.0.x by this push:
     new e5bb09c  Polish. Fix indent.
e5bb09c is described below

commit e5bb09c3d6fb0edb742e8b0eb441ca7ee9cb5316
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Jul 22 11:02:00 2019 +0100

    Polish. Fix indent.
---
 java/javax/servlet/AsyncContext.java | 55 +++++++++++++++++++++++++-----------
 1 file changed, 39 insertions(+), 16 deletions(-)

diff --git a/java/javax/servlet/AsyncContext.java b/java/javax/servlet/AsyncContext.java
index 7ec7817..45b3ebf 100644
--- a/java/javax/servlet/AsyncContext.java
+++ b/java/javax/servlet/AsyncContext.java
@@ -22,15 +22,15 @@ package javax.servlet;
  */
 public interface AsyncContext {
     public static final String ASYNC_REQUEST_URI =
-        "javax.servlet.async.request_uri";
+            "javax.servlet.async.request_uri";
     public static final String ASYNC_CONTEXT_PATH  =
-        "javax.servlet.async.context_path";
+            "javax.servlet.async.context_path";
     public static final String ASYNC_PATH_INFO =
-        "javax.servlet.async.path_info";
+            "javax.servlet.async.path_info";
     public static final String ASYNC_SERVLET_PATH =
-        "javax.servlet.async.servlet_path";
+            "javax.servlet.async.servlet_path";
     public static final String ASYNC_QUERY_STRING =
-        "javax.servlet.async.query_string";
+            "javax.servlet.async.query_string";
 
     ServletRequest getRequest();
 
@@ -39,23 +39,41 @@ public interface AsyncContext {
     boolean hasOriginalRequestAndResponse();
 
     /**
-     *
-     * @throws IllegalStateException
+     * @throws IllegalStateException if this method is called when the request
+     * is not in asynchronous mode. The request is in asynchronous mode after
+     * {@link javax.servlet.http.HttpServletRequest#startAsync()} or
+     * {@link javax.servlet.http.HttpServletRequest#startAsync(ServletRequest,
+     * ServletResponse)} has been called and before {@link #complete()} or any
+     * other dispatch() method has been called.
      */
     void dispatch();
 
     /**
+     * @param path The path to which the request/response should be dispatched
+     *             relative to the {@link ServletContext} from which this async
+     *             request was started.
      *
-     * @param path
-     * @throws IllegalStateException
+     * @throws IllegalStateException if this method is called when the request
+     * is not in asynchronous mode. The request is in asynchronous mode after
+     * {@link javax.servlet.http.HttpServletRequest#startAsync()} or
+     * {@link javax.servlet.http.HttpServletRequest#startAsync(ServletRequest,
+     * ServletResponse)} has been called and before {@link #complete()} or any
+     * other dispatch() method has been called.
      */
     void dispatch(String path);
 
     /**
+     * @param path The path to which the request/response should be dispatched
+     *             relative to the specified {@link ServletContext}.
+     * @param context The {@link ServletContext} to which the request/response
+     *                should be dispatched.
      *
-     * @param context
-     * @param path
-     * @throws IllegalStateException
+     * @throws IllegalStateException if this method is called when the request
+     * is not in asynchronous mode. The request is in asynchronous mode after
+     * {@link javax.servlet.http.HttpServletRequest#startAsync()} or
+     * {@link javax.servlet.http.HttpServletRequest#startAsync(ServletRequest,
+     * ServletResponse)} has been called and before {@link #complete()} or any
+     * other dispatch() method has been called.
      */
     void dispatch(ServletContext context, String path);
 
@@ -72,12 +90,17 @@ public interface AsyncContext {
     throws ServletException;
 
     /**
-     * Get timeout in milliseconds. 0 or less indicates no timeout.
+     * Set the timeout.
+     *
+     * @param timeout The timeout in milliseconds. 0 or less indicates no
+     *                timeout.
      */
-    long getTimeout();
+    void setTimeout(long timeout);
 
     /**
-     * Set timeout in milliseconds. 0 or less indicates no timeout.
+     * Get the current.
+     *
+     * @return The timeout in milliseconds. 0 or less indicates no timeout.
      */
-    void setTimeout(long timeout);
+    long getTimeout();
 }


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org