tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r967146 [1/3] - /tomcat/trunk/java/javax/servlet/http/
Date Fri, 23 Jul 2010 16:03:26 GMT
Author: markt
Date: Fri Jul 23 16:03:25 2010
New Revision: 967146

URL: http://svn.apache.org/viewvc?rev=967146&view=rev
Log:
Tab police: javax.servlet.http
Thanks to Checkstyle and Eclipse source formatting

Modified:
    tomcat/trunk/java/javax/servlet/http/Cookie.java
    tomcat/trunk/java/javax/servlet/http/HttpServletRequest.java
    tomcat/trunk/java/javax/servlet/http/HttpServletRequestWrapper.java
    tomcat/trunk/java/javax/servlet/http/HttpServletResponse.java
    tomcat/trunk/java/javax/servlet/http/HttpServletResponseWrapper.java
    tomcat/trunk/java/javax/servlet/http/HttpSession.java
    tomcat/trunk/java/javax/servlet/http/HttpSessionAttributeListener.java
    tomcat/trunk/java/javax/servlet/http/HttpSessionBindingEvent.java
    tomcat/trunk/java/javax/servlet/http/HttpSessionBindingListener.java
    tomcat/trunk/java/javax/servlet/http/HttpSessionContext.java
    tomcat/trunk/java/javax/servlet/http/HttpSessionEvent.java
    tomcat/trunk/java/javax/servlet/http/HttpSessionListener.java

Modified: tomcat/trunk/java/javax/servlet/http/Cookie.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/http/Cookie.java?rev=967146&r1=967145&r2=967146&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/http/Cookie.java (original)
+++ tomcat/trunk/java/javax/servlet/http/Cookie.java Fri Jul 23 16:03:25 2010
@@ -1,19 +1,19 @@
 /*
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements.  See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License.  You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package javax.servlet.http;
 
 import java.io.Serializable;
@@ -22,121 +22,109 @@ import java.util.Locale;
 import java.util.ResourceBundle;
 
 /**
- *
- * Creates a cookie, a small amount of information sent by a servlet to 
- * a Web browser, saved by the browser, and later sent back to the server.
- * A cookie's value can uniquely 
- * identify a client, so cookies are commonly used for session management.
- * 
- * <p>A cookie has a name, a single value, and optional attributes
- * such as a comment, path and domain qualifiers, a maximum age, and a
- * version number. Some Web browsers have bugs in how they handle the 
- * optional attributes, so use them sparingly to improve the interoperability 
- * of your servlets.
- *
- * <p>The servlet sends cookies to the browser by using the
- * {@link HttpServletResponse#addCookie} method, which adds
- * fields to HTTP response headers to send cookies to the 
- * browser, one at a time. The browser is expected to 
- * support 20 cookies for each Web server, 300 cookies total, and
+ * Creates a cookie, a small amount of information sent by a servlet to a Web
+ * browser, saved by the browser, and later sent back to the server. A cookie's
+ * value can uniquely identify a client, so cookies are commonly used for
+ * session management.
+ * <p>
+ * A cookie has a name, a single value, and optional attributes such as a
+ * comment, path and domain qualifiers, a maximum age, and a version number.
+ * Some Web browsers have bugs in how they handle the optional attributes, so
+ * use them sparingly to improve the interoperability of your servlets.
+ * <p>
+ * The servlet sends cookies to the browser by using the
+ * {@link HttpServletResponse#addCookie} method, which adds fields to HTTP
+ * response headers to send cookies to the browser, one at a time. The browser
+ * is expected to support 20 cookies for each Web server, 300 cookies total, and
  * may limit cookie size to 4 KB each.
+ * <p>
+ * The browser returns cookies to the servlet by adding fields to HTTP request
+ * headers. Cookies can be retrieved from a request by using the
+ * {@link HttpServletRequest#getCookies} method. Several cookies might have the
+ * same name but different path attributes.
+ * <p>
+ * Cookies affect the caching of the Web pages that use them. HTTP 1.0 does not
+ * cache pages that use cookies created with this class. This class does not
+ * support the cache control defined with HTTP 1.1.
+ * <p>
+ * This class supports both the Version 0 (by Netscape) and Version 1 (by RFC
+ * 2109) cookie specifications. By default, cookies are created using Version 0
+ * to ensure the best interoperability.
  * 
- * <p>The browser returns cookies to the servlet by adding 
- * fields to HTTP request headers. Cookies can be retrieved
- * from a request by using the {@link HttpServletRequest#getCookies} method.
- * Several cookies might have the same name but different path attributes.
- * 
- * <p>Cookies affect the caching of the Web pages that use them. 
- * HTTP 1.0 does not cache pages that use cookies created with
- * this class. This class does not support the cache control
- * defined with HTTP 1.1.
- *
- * <p>This class supports both the Version 0 (by Netscape) and Version 1 
- * (by RFC 2109) cookie specifications. By default, cookies are
- * created using Version 0 to ensure the best interoperability.
- *
- *
- * @author	Various
- * @version	$Version$
- *
+ * @author Various
+ * @version $Version$
  */
 public class Cookie implements Cloneable, Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    private static final String LSTRING_FILE =
-	"javax.servlet.http.LocalStrings";
-    private static ResourceBundle lStrings =
-	ResourceBundle.getBundle(LSTRING_FILE);
-    
+    private static final String LSTRING_FILE = "javax.servlet.http.LocalStrings";
+    private static ResourceBundle lStrings = ResourceBundle.getBundle(LSTRING_FILE);
+
     //
     // The value of the cookie itself.
     //
-    
-    private String name;	// NAME= ... "$Name" style is reserved
-    private String value;	// value of NAME
+
+    private String name; // NAME= ... "$Name" style is reserved
+    private String value; // value of NAME
 
     //
     // Attributes encoded in the header's cookie fields.
     //
-    
-    private String comment;    // ;Comment=VALUE ... describes cookie's use
-                               // ;Discard ... implied by maxAge < 0
-    private String domain;     // ;Domain=VALUE ... domain that sees cookie
-    private int maxAge = -1;   // ;Max-Age=VALUE ... cookies auto-expire
-    private String path;       // ;Path=VALUE ... URLs that see the cookie
-    private boolean secure;    // ;Secure ... e.g. use SSL
-    private int version = 0;   // ;Version=1 ... means RFC 2109++ style
-    private boolean httpOnly;  // Not in cookie specs, but supported by browsers
-    
+
+    private String comment; // ;Comment=VALUE ... describes cookie's use
+    // ;Discard ... implied by maxAge < 0
+    private String domain; // ;Domain=VALUE ... domain that sees cookie
+    private int maxAge = -1; // ;Max-Age=VALUE ... cookies auto-expire
+    private String path; // ;Path=VALUE ... URLs that see the cookie
+    private boolean secure; // ;Secure ... e.g. use SSL
+    private int version = 0; // ;Version=1 ... means RFC 2109++ style
+    private boolean httpOnly; // Not in cookie specs, but supported by browsers
 
     /**
      * Constructs a cookie with a specified name and value.
-     *
-     * <p>The name must conform to RFC 2109. That means it can contain 
-     * only ASCII alphanumeric characters and cannot contain commas, 
-     * semicolons, or white space or begin with a $ character. The cookie's
-     * name cannot be changed after creation.
-     *
-     * <p>The value can be anything the server chooses to send. Its
-     * value is probably of interest only to the server. The cookie's
-     * value can be changed after creation with the
-     * <code>setValue</code> method.
-     *
-     * <p>By default, cookies are created according to the Netscape
-     * cookie specification. The version can be changed with the 
+     * <p>
+     * The name must conform to RFC 2109. That means it can contain only ASCII
+     * alphanumeric characters and cannot contain commas, semicolons, or white
+     * space or begin with a $ character. The cookie's name cannot be changed
+     * after creation.
+     * <p>
+     * The value can be anything the server chooses to send. Its value is
+     * probably of interest only to the server. The cookie's value can be
+     * changed after creation with the <code>setValue</code> method.
+     * <p>
+     * By default, cookies are created according to the Netscape cookie
+     * specification. The version can be changed with the
      * <code>setVersion</code> method.
-     *
-     *
-     * @param name 			a <code>String</code> specifying the name of the cookie
-     *
-     * @param value			a <code>String</code> specifying the value of the cookie
-     *
-     * @throws IllegalArgumentException	if the cookie name contains illegal characters
-     *					(for example, a comma, space, or semicolon)
-     *					or it is one of the tokens reserved for use
-     *					by the cookie protocol
+     * 
+     * @param name
+     *            a <code>String</code> specifying the name of the cookie
+     * @param value
+     *            a <code>String</code> specifying the value of the cookie
+     * @throws IllegalArgumentException
+     *             if the cookie name contains illegal characters (for example,
+     *             a comma, space, or semicolon) or it is one of the tokens
+     *             reserved for use by the cookie protocol
      * @see #setValue
      * @see #setVersion
-     *
      */
-
     public Cookie(String name, String value) {
         if (name == null || name.length() == 0) {
             throw new IllegalArgumentException(
                     lStrings.getString("err.cookie_name_blank"));
         }
-        if (!isToken(name)
-                || name.equalsIgnoreCase("Comment") // rfc2019
-                || name.equalsIgnoreCase("Discard") // 2019++
-                || name.equalsIgnoreCase("Domain")
-                || name.equalsIgnoreCase("Expires") // (old cookies)
-                || name.equalsIgnoreCase("Max-Age") // rfc2019
-                || name.equalsIgnoreCase("Path")
-                || name.equalsIgnoreCase("Secure")
-                || name.equalsIgnoreCase("Version")
-                || name.startsWith("$")
-            ) {
+        if (!isToken(name) ||
+                name.equalsIgnoreCase("Comment") // rfc2019
+                ||
+                name.equalsIgnoreCase("Discard") // 2019++
+                ||
+                name.equalsIgnoreCase("Domain") ||
+                name.equalsIgnoreCase("Expires") // (old cookies)
+                ||
+                name.equalsIgnoreCase("Max-Age") // rfc2019
+                || name.equalsIgnoreCase("Path") ||
+                name.equalsIgnoreCase("Secure") ||
+                name.equalsIgnoreCase("Version") || name.startsWith("$")) {
             String errMsg = lStrings.getString("err.cookie_name_is_token");
             Object[] errArgs = new Object[1];
             errArgs[0] = name;
@@ -148,339 +136,225 @@ public class Cookie implements Cloneable
         this.value = value;
     }
 
-
-
-
-
     /**
-     *
-     * Specifies a comment that describes a cookie's purpose.
-     * The comment is useful if the browser presents the cookie 
-     * to the user. Comments
-     * are not supported by Netscape Version 0 cookies.
-     *
-     * @param purpose		a <code>String</code> specifying the comment 
-     *				to display to the user
-     *
+     * Specifies a comment that describes a cookie's purpose. The comment is
+     * useful if the browser presents the cookie to the user. Comments are not
+     * supported by Netscape Version 0 cookies.
+     * 
+     * @param purpose
+     *            a <code>String</code> specifying the comment to display to the
+     *            user
      * @see #getComment
-     *
      */
-
     public void setComment(String purpose) {
-	comment = purpose;
+        comment = purpose;
     }
-    
-    
-    
 
     /**
      * Returns the comment describing the purpose of this cookie, or
      * <code>null</code> if the cookie has no comment.
-     *
-     * @return			a <code>String</code> containing the comment,
-     *				or <code>null</code> if none
-     *
+     * 
+     * @return a <code>String</code> containing the comment, or
+     *         <code>null</code> if none
      * @see #setComment
-     *
-     */ 
-
+     */
     public String getComment() {
-	return comment;
+        return comment;
     }
-    
-    
-    
-
 
     /**
-     *
      * Specifies the domain within which this cookie should be presented.
-     *
-     * <p>The form of the domain name is specified by RFC 2109. A domain
-     * name begins with a dot (<code>.foo.com</code>) and means that
-     * the cookie is visible to servers in a specified Domain Name System
-     * (DNS) zone (for example, <code>www.foo.com</code>, but not 
-     * <code>a.b.foo.com</code>). By default, cookies are only returned
-     * to the server that sent them.
-     *
-     *
-     * @param pattern		a <code>String</code> containing the domain name
-     *				within which this cookie is visible;
-     *				form is according to RFC 2109
-     *
+     * <p>
+     * The form of the domain name is specified by RFC 2109. A domain name
+     * begins with a dot (<code>.foo.com</code>) and means that the cookie is
+     * visible to servers in a specified Domain Name System (DNS) zone (for
+     * example, <code>www.foo.com</code>, but not <code>a.b.foo.com</code>). By
+     * default, cookies are only returned to the server that sent them.
+     * 
+     * @param pattern
+     *            a <code>String</code> containing the domain name within which
+     *            this cookie is visible; form is according to RFC 2109
      * @see #getDomain
-     *
      */
-
     public void setDomain(String pattern) {
-	domain = pattern.toLowerCase(Locale.ENGLISH);	// IE allegedly needs this
+        domain = pattern.toLowerCase(Locale.ENGLISH); // IE allegedly needs this
     }
-    
-    
-    
-    
 
     /**
-     * Returns the domain name set for this cookie. The form of 
-     * the domain name is set by RFC 2109.
-     *
-     * @return			a <code>String</code> containing the domain name
-     *
+     * Returns the domain name set for this cookie. The form of the domain name
+     * is set by RFC 2109.
+     * 
+     * @return a <code>String</code> containing the domain name
      * @see #setDomain
-     *
-     */ 
-
+     */
     public String getDomain() {
-	return domain;
+        return domain;
     }
 
-
-
-
     /**
      * Sets the maximum age of the cookie in seconds.
-     *
-     * <p>A positive value indicates that the cookie will expire
-     * after that many seconds have passed. Note that the value is
-     * the <i>maximum</i> age when the cookie will expire, not the cookie's
-     * current age.
-     *
-     * <p>A negative value means
-     * that the cookie is not stored persistently and will be deleted
-     * when the Web browser exits. A zero value causes the cookie
-     * to be deleted.
-     *
-     * @param expiry		an integer specifying the maximum age of the
-     * 				cookie in seconds; if negative, means
-     *				the cookie is not stored; if zero, deletes
-     *				the cookie
-     *
-     *
+     * <p>
+     * A positive value indicates that the cookie will expire after that many
+     * seconds have passed. Note that the value is the <i>maximum</i> age when
+     * the cookie will expire, not the cookie's current age.
+     * <p>
+     * A negative value means that the cookie is not stored persistently and
+     * will be deleted when the Web browser exits. A zero value causes the
+     * cookie to be deleted.
+     * 
+     * @param expiry
+     *            an integer specifying the maximum age of the cookie in
+     *            seconds; if negative, means the cookie is not stored; if zero,
+     *            deletes the cookie
      * @see #getMaxAge
-     *
      */
-
     public void setMaxAge(int expiry) {
-	maxAge = expiry;
+        maxAge = expiry;
     }
 
-
-
-
     /**
-     * Returns the maximum age of the cookie, specified in seconds,
-     * By default, <code>-1</code> indicating the cookie will persist
-     * until browser shutdown.
-     *
-     *
-     * @return			an integer specifying the maximum age of the
-     *				cookie in seconds; if negative, means
-     *				the cookie persists until browser shutdown
-     *
-     *
+     * Returns the maximum age of the cookie, specified in seconds, By default,
+     * <code>-1</code> indicating the cookie will persist until browser
+     * shutdown.
+     * 
+     * @return an integer specifying the maximum age of the cookie in seconds; if
+     *         negative, means the cookie persists until browser shutdown
      * @see #setMaxAge
-     *
      */
-
     public int getMaxAge() {
-	return maxAge;
+        return maxAge;
     }
-    
-    
-    
-
-    /**
-     * Specifies a path for the cookie
-     * to which the client should return the cookie.
-     *
-     * <p>The cookie is visible to all the pages in the directory
-     * you specify, and all the pages in that directory's subdirectories. 
-     * A cookie's path must include the servlet that set the cookie,
-     * for example, <i>/catalog</i>, which makes the cookie
-     * visible to all directories on the server under <i>/catalog</i>.
-     *
-     * <p>Consult RFC 2109 (available on the Internet) for more
-     * information on setting path names for cookies.
-     *
-     *
-     * @param uri		a <code>String</code> specifying a path
-     *
-     *
+
+    /**
+     * Specifies a path for the cookie to which the client should return the
+     * cookie.
+     * <p>
+     * The cookie is visible to all the pages in the directory you specify, and
+     * all the pages in that directory's subdirectories. A cookie's path must
+     * include the servlet that set the cookie, for example, <i>/catalog</i>,
+     * which makes the cookie visible to all directories on the server under
+     * <i>/catalog</i>.
+     * <p>
+     * Consult RFC 2109 (available on the Internet) for more information on
+     * setting path names for cookies.
+     * 
+     * @param uri
+     *            a <code>String</code> specifying a path
      * @see #getPath
-     *
      */
-
     public void setPath(String uri) {
-	path = uri;
+        path = uri;
     }
 
-
-
-
     /**
-     * Returns the path on the server 
-     * to which the browser returns this cookie. The
-     * cookie is visible to all subpaths on the server.
-     *
-     *
-     * @return		a <code>String</code> specifying a path that contains
-     *			a servlet name, for example, <i>/catalog</i>
-     *
+     * Returns the path on the server to which the browser returns this cookie.
+     * The cookie is visible to all subpaths on the server.
+     * 
+     * @return a <code>String</code> specifying a path that contains a servlet
+     *         name, for example, <i>/catalog</i>
      * @see #setPath
-     *
-     */ 
-
+     */
     public String getPath() {
-	return path;
+        return path;
     }
 
-
-
-
-
     /**
-     * Indicates to the browser whether the cookie should only be sent
-     * using a secure protocol, such as HTTPS or SSL.
-     *
-     * <p>The default value is <code>false</code>.
-     *
-     * @param flag	if <code>true</code>, sends the cookie from the browser
-     *			to the server only when using a secure protocol;
-     *			if <code>false</code>, sent on any protocol
-     *
+     * Indicates to the browser whether the cookie should only be sent using a
+     * secure protocol, such as HTTPS or SSL.
+     * <p>
+     * The default value is <code>false</code>.
+     * 
+     * @param flag
+     *            if <code>true</code>, sends the cookie from the browser to the
+     *            server only when using a secure protocol; if
+     *            <code>false</code>, sent on any protocol
      * @see #getSecure
-     *
      */
- 
     public void setSecure(boolean flag) {
-	secure = flag;
+        secure = flag;
     }
 
-
-
-
     /**
-     * Returns <code>true</code> if the browser is sending cookies
-     * only over a secure protocol, or <code>false</code> if the
-     * browser can send cookies using any protocol.
-     *
-     * @return		<code>true</code> if the browser uses a secure protocol;
-     * 			 otherwise, <code>true</code>
-     *
+     * Returns <code>true</code> if the browser is sending cookies only over a
+     * secure protocol, or <code>false</code> if the browser can send cookies
+     * using any protocol.
+     * 
+     * @return <code>true</code> if the browser uses a secure protocol;
+     *         otherwise, <code>true</code>
      * @see #setSecure
-     *
      */
-
     public boolean getSecure() {
-	return secure;
+        return secure;
     }
 
-
-
-
-
     /**
      * Returns the name of the cookie. The name cannot be changed after
      * creation.
-     *
-     * @return		a <code>String</code> specifying the cookie's name
-     *
+     * 
+     * @return a <code>String</code> specifying the cookie's name
      */
-
     public String getName() {
-	return name;
+        return name;
     }
 
-
-
-
-
     /**
-     *
-     * Assigns a new value to a cookie after the cookie is created.
-     * If you use a binary value, you may want to use BASE64 encoding.
-     *
-     * <p>With Version 0 cookies, values should not contain white 
-     * space, brackets, parentheses, equals signs, commas,
-     * double quotes, slashes, question marks, at signs, colons,
-     * and semicolons. Empty values may not behave the same way
-     * on all browsers.
-     *
-     * @param newValue		a <code>String</code> specifying the new value 
-     *
-     *
+     * Assigns a new value to a cookie after the cookie is created. If you use a
+     * binary value, you may want to use BASE64 encoding.
+     * <p>
+     * With Version 0 cookies, values should not contain white space, brackets,
+     * parentheses, equals signs, commas, double quotes, slashes, question
+     * marks, at signs, colons, and semicolons. Empty values may not behave the
+     * same way on all browsers.
+     * 
+     * @param newValue
+     *            a <code>String</code> specifying the new value
      * @see #getValue
      * @see Cookie
-     *
      */
-
     public void setValue(String newValue) {
-	value = newValue;
+        value = newValue;
     }
 
-
-
-
     /**
      * Returns the value of the cookie.
-     *
-     * @return			a <code>String</code> containing the cookie's
-     *				present value
-     *
+     * 
+     * @return a <code>String</code> containing the cookie's present value
      * @see #setValue
      * @see Cookie
-     *
      */
-
     public String getValue() {
-	return value;
+        return value;
     }
 
-
-
-
     /**
-     * Returns the version of the protocol this cookie complies 
-     * with. Version 1 complies with RFC 2109, 
-     * and version 0 complies with the original
-     * cookie specification drafted by Netscape. Cookies provided
-     * by a browser use and identify the browser's cookie version.
+     * Returns the version of the protocol this cookie complies with. Version 1
+     * complies with RFC 2109, and version 0 complies with the original cookie
+     * specification drafted by Netscape. Cookies provided by a browser use and
+     * identify the browser's cookie version.
      * 
-     *
-     * @return			0 if the cookie complies with the
-     *				original Netscape specification; 1
-     *				if the cookie complies with RFC 2109
-     *
+     * @return 0 if the cookie complies with the original Netscape specification;
+     *         1 if the cookie complies with RFC 2109
      * @see #setVersion
-     *
      */
-
     public int getVersion() {
-	return version;
+        return version;
     }
 
-
-
-
     /**
-     * Sets the version of the cookie protocol this cookie complies
-     * with. Version 0 complies with the original Netscape cookie
-     * specification. Version 1 complies with RFC 2109.
-     *
-     * <p>Since RFC 2109 is still somewhat new, consider
-     * version 1 as experimental; do not use it yet on production sites.
-     *
-     *
-     * @param v			0 if the cookie should comply with 
-     *				the original Netscape specification;
-     *				1 if the cookie should comply with RFC 2109
-     *
+     * Sets the version of the cookie protocol this cookie complies with.
+     * Version 0 complies with the original Netscape cookie specification.
+     * Version 1 complies with RFC 2109.
+     * <p>
+     * Since RFC 2109 is still somewhat new, consider version 1 as experimental;
+     * do not use it yet on production sites.
+     * 
+     * @param v
+     *            0 if the cookie should comply with the original Netscape
+     *            specification; 1 if the cookie should comply with RFC 2109
      * @see #getVersion
-     *
      */
-
     public void setVersion(int v) {
-	version = v;
+        version = v;
     }
 
     // Note -- disabled for now to allow full Netscape compatibility
@@ -492,7 +366,7 @@ public class Cookie implements Cloneable
     private static final String tspecials2NoSlash = "()<>@,;:\\\"[]?={} \t";
     private static final String tspecials2WithSlash = tspecials2NoSlash + "/";
     private static final String tspecials2;
-    
+
     /**
      * If set to true, we parse cookies strictly according to the servlet,
      * cookie and HTTP specs by default.
@@ -514,19 +388,17 @@ public class Cookie implements Cloneable
      */
     private static final boolean STRICT_NAMING;
 
-
     static {
-        STRICT_SERVLET_COMPLIANCE = Boolean.valueOf(System.getProperty(
-                "org.apache.catalina.STRICT_SERVLET_COMPLIANCE",
-                "false")).booleanValue();
+        STRICT_SERVLET_COMPLIANCE = Boolean.valueOf(
+                System.getProperty(
+                        "org.apache.catalina.STRICT_SERVLET_COMPLIANCE",
+                        "false")).booleanValue();
 
-        String  fwdSlashIsSeparator = System.getProperty(
-                "org.apache.tomcat.util.http.ServerCookie.FWD_SLASH_IS_SEPARATOR");
+        String fwdSlashIsSeparator = System.getProperty("org.apache.tomcat.util.http.ServerCookie.FWD_SLASH_IS_SEPARATOR");
         if (fwdSlashIsSeparator == null) {
             FWD_SLASH_IS_SEPARATOR = STRICT_SERVLET_COMPLIANCE;
         } else {
-            FWD_SLASH_IS_SEPARATOR =
-                Boolean.valueOf(fwdSlashIsSeparator).booleanValue();
+            FWD_SLASH_IS_SEPARATOR = Boolean.valueOf(fwdSlashIsSeparator).booleanValue();
         }
 
         if (FWD_SLASH_IS_SEPARATOR) {
@@ -534,30 +406,22 @@ public class Cookie implements Cloneable
         } else {
             tspecials2 = tspecials2NoSlash;
         }
-        
-        String strictNaming = System.getProperty(
-                "org.apache.tomcat.util.http.ServerCookie.STRICT_NAMING");
+
+        String strictNaming = System.getProperty("org.apache.tomcat.util.http.ServerCookie.STRICT_NAMING");
         if (strictNaming == null) {
             STRICT_NAMING = STRICT_SERVLET_COMPLIANCE;
         } else {
-            STRICT_NAMING =
-                Boolean.valueOf(strictNaming).booleanValue();
+            STRICT_NAMING = Boolean.valueOf(strictNaming).booleanValue();
         }
 
     }
 
-
-    
-
     /*
-     * Tests a string and returns true if the string counts as a 
-     * reserved token in the Java language.
-     * 
-     * @param value		the <code>String</code> to be tested
-     *
-     * @return			<code>true</code> if the <code>String</code> is
-     *				a reserved token; <code>false</code>
-     *				if it is not			
+     * Tests a string and returns true if the string counts as a reserved token
+     * in the Java language.
+     * @param value the <code>String</code> to be tested
+     * @return <code>true</code> if the <code>String</code> is a reserved token;
+     * <code>false</code> if it is not
      */
     private boolean isToken(String possibleToken) {
         int len = possibleToken.length();
@@ -573,43 +437,32 @@ public class Cookie implements Cloneable
         return true;
     }
 
-
-
     /**
-     *
-     * Overrides the standard <code>java.lang.Object.clone</code> 
-     * method to return a copy of this cookie.
-     *		
-     *
+     * Overrides the standard <code>java.lang.Object.clone</code> method to
+     * return a copy of this cookie.
      */
-
     @Override
     public Object clone() {
-	try {
-	    return super.clone();
-	} catch (CloneNotSupportedException e) {
-	    throw new RuntimeException(e.getMessage());
-	}
+        try {
+            return super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new RuntimeException(e.getMessage());
+        }
     }
 
     /**
-     * 
      * @return
-     * @since Servlet 3.0
-     * TODO SERVLET3 - Add comments
+     * @since Servlet 3.0 TODO SERVLET3 - Add comments
      */
     public boolean isHttpOnly() {
         return httpOnly;
     }
 
     /**
-     * 
      * @param httpOnly
-     * @since Servlet 3.0
-     * TODO SERVLET3 - Add comments
+     * @since Servlet 3.0 TODO SERVLET3 - Add comments
      */
     public void setHttpOnly(boolean httpOnly) {
         this.httpOnly = httpOnly;
     }
 }
-

Modified: tomcat/trunk/java/javax/servlet/http/HttpServletRequest.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/http/HttpServletRequest.java?rev=967146&r1=967145&r2=967146&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/http/HttpServletRequest.java (original)
+++ tomcat/trunk/java/javax/servlet/http/HttpServletRequest.java Fri Jul 23 16:03:25 2010
@@ -1,19 +1,19 @@
 /*
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements.  See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License.  You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 
 package javax.servlet.http;
 
@@ -25,702 +25,462 @@ import java.util.Collection;
 import java.util.Enumeration;
 
 /**
- *
- * Extends the {@link javax.servlet.ServletRequest} interface
- * to provide request information for HTTP servlets. 
- *
- * <p>The servlet container creates an <code>HttpServletRequest</code> 
- * object and passes it as an argument to the servlet's service
- * methods (<code>doGet</code>, <code>doPost</code>, etc).
- *
- *
- * @author 	Various
- * @version	$Version$
- *
- *
+ * Extends the {@link javax.servlet.ServletRequest} interface to provide request
+ * information for HTTP servlets.
+ * <p>
+ * The servlet container creates an <code>HttpServletRequest</code> object and
+ * passes it as an argument to the servlet's service methods (<code>doGet</code>, <code>doPost</code>, etc).
+ * 
+ * @author Various
+ * @version $Version$
  */
-
 public interface HttpServletRequest extends ServletRequest {
 
     /**
-    * String identifier for Basic authentication. Value "BASIC"
-    */
+     * String identifier for Basic authentication. Value "BASIC"
+     */
     public static final String BASIC_AUTH = "BASIC";
     /**
-    * String identifier for Form authentication. Value "FORM"
-    */
+     * String identifier for Form authentication. Value "FORM"
+     */
     public static final String FORM_AUTH = "FORM";
     /**
-    * String identifier for Client Certificate authentication. Value "CLIENT_CERT"
-    */
+     * String identifier for Client Certificate authentication. Value
+     * "CLIENT_CERT"
+     */
     public static final String CLIENT_CERT_AUTH = "CLIENT_CERT";
     /**
-    * String identifier for Digest authentication. Value "DIGEST"
-    */
+     * String identifier for Digest authentication. Value "DIGEST"
+     */
     public static final String DIGEST_AUTH = "DIGEST";
 
     /**
-     * Returns the name of the authentication scheme used to protect
-     * the servlet. All servlet containers support basic, form and client 
-     * certificate authentication, and may additionally support digest 
-     * authentication.
-     * If the servlet is not authenticated <code>null</code> is returned. 
-     *
-     * <p>Same as the value of the CGI variable AUTH_TYPE.
-     *
-     *
-     * @return		one of the static members BASIC_AUTH, 
-     *			FORM_AUTH, CLIENT_CERT_AUTH, DIGEST_AUTH
-     *			(suitable for == comparison) or
-     *			the container-specific string indicating
-     *			the authentication scheme, or
-     *			<code>null</code> if the request was 
-     *			not authenticated.     
-     *
+     * Returns the name of the authentication scheme used to protect the
+     * servlet. All servlet containers support basic, form and client
+     * certificate authentication, and may additionally support digest
+     * authentication. If the servlet is not authenticated <code>null</code> is
+     * returned.
+     * <p>
+     * Same as the value of the CGI variable AUTH_TYPE.
+     * 
+     * @return one of the static members BASIC_AUTH, FORM_AUTH, CLIENT_CERT_AUTH,
+     *         DIGEST_AUTH (suitable for == comparison) or the
+     *         container-specific string indicating the authentication scheme,
+     *         or <code>null</code> if the request was not authenticated.
      */
-   
     public String getAuthType();
-    
-   
-    
 
     /**
-     *
-     * Returns an array containing all of the <code>Cookie</code>
-     * objects the client sent with this request.
-     * This method returns <code>null</code> if no cookies were sent.
-     *
-     * @return		an array of all the <code>Cookies</code>
-     *			included with this request, or <code>null</code>
-     *			if the request has no cookies
-     *
-     *
+     * Returns an array containing all of the <code>Cookie</code> objects the
+     * client sent with this request. This method returns <code>null</code> if
+     * no cookies were sent.
+     * 
+     * @return an array of all the <code>Cookies</code> included with this
+     *         request, or <code>null</code> if the request has no cookies
      */
-
     public Cookie[] getCookies();
-    
-    
-    
 
     /**
-     *
-     * Returns the value of the specified request header
-     * as a <code>long</code> value that represents a 
-     * <code>Date</code> object. Use this method with
-     * headers that contain dates, such as
-     * <code>If-Modified-Since</code>. 
-     *
-     * <p>The date is returned as
-     * the number of milliseconds since January 1, 1970 GMT.
-     * The header name is case insensitive.
-     *
-     * <p>If the request did not have a header of the
-     * specified name, this method returns -1. If the header
-     * can't be converted to a date, the method throws
+     * Returns the value of the specified request header as a <code>long</code>
+     * value that represents a <code>Date</code> object. Use this method with
+     * headers that contain dates, such as <code>If-Modified-Since</code>.
+     * <p>
+     * The date is returned as the number of milliseconds since January 1, 1970
+     * GMT. The header name is case insensitive.
+     * <p>
+     * If the request did not have a header of the specified name, this method
+     * returns -1. If the header can't be converted to a date, the method throws
      * an <code>IllegalArgumentException</code>.
-     *
-     * @param name		a <code>String</code> specifying the
-     *				name of the header
-     *
-     * @return			a <code>long</code> value
-     *				representing the date specified
-     *				in the header expressed as
-     *				the number of milliseconds
-     *				since January 1, 1970 GMT,
-     *				or -1 if the named header
-     *				was not included with the
-     *				request
-     *
-     * @exception	IllegalArgumentException	If the header value
-     *							can't be converted
-     *							to a date
-     *
+     * 
+     * @param name
+     *            a <code>String</code> specifying the name of the header
+     * @return a <code>long</code> value representing the date specified in the
+     *         header expressed as the number of milliseconds since January 1,
+     *         1970 GMT, or -1 if the named header was not included with the
+     *         request
+     * @exception IllegalArgumentException
+     *                If the header value can't be converted to a date
      */
-
     public long getDateHeader(String name);
-    
-    
-    
-
-    /**
-     *
-     * Returns the value of the specified request header
-     * as a <code>String</code>. If the request did not include a header
-     * of the specified name, this method returns <code>null</code>.
-     * If there are multiple headers with the same name, this method
-     * returns the first head in the request.
-     * The header name is case insensitive. You can use
-     * this method with any request header.
-     *
-     * @param name		a <code>String</code> specifying the
-     *				header name
-     *
-     * @return			a <code>String</code> containing the
-     *				value of the requested
-     *				header, or <code>null</code>
-     *				if the request does not
-     *				have a header of that name
-     *
-     */			
-
-    public String getHeader(String name); 
-
-
 
+    /**
+     * Returns the value of the specified request header as a
+     * <code>String</code>. If the request did not include a header of the
+     * specified name, this method returns <code>null</code>. If there are
+     * multiple headers with the same name, this method returns the first head
+     * in the request. The header name is case insensitive. You can use this
+     * method with any request header.
+     * 
+     * @param name
+     *            a <code>String</code> specifying the header name
+     * @return a <code>String</code> containing the value of the requested
+     *         header, or <code>null</code> if the request does not have a
+     *         header of that name
+     */
+    public String getHeader(String name);
+
+    /**
+     * Returns all the values of the specified request header as an
+     * <code>Enumeration</code> of <code>String</code> objects.
+     * <p>
+     * Some headers, such as <code>Accept-Language</code> can be sent by clients
+     * as several headers each with a different value rather than sending the
+     * header as a comma separated list.
+     * <p>
+     * If the request did not include any headers of the specified name, this
+     * method returns an empty <code>Enumeration</code>. The header name is case
+     * insensitive. You can use this method with any request header.
+     * 
+     * @param name
+     *            a <code>String</code> specifying the header name
+     * @return an <code>Enumeration</code> containing the values of the requested
+     *         header. If the request does not have any headers of that name
+     *         return an empty enumeration. If the container does not allow
+     *         access to header information, return null
+     */
+    public Enumeration<String> getHeaders(String name);
 
     /**
-     *
-     * Returns all the values of the specified request header
-     * as an <code>Enumeration</code> of <code>String</code> objects.
-     *
-     * <p>Some headers, such as <code>Accept-Language</code> can be sent
-     * by clients as several headers each with a different value rather than
-     * sending the header as a comma separated list.
-     *
-     * <p>If the request did not include any headers
-     * of the specified name, this method returns an empty
-     * <code>Enumeration</code>.
-     * The header name is case insensitive. You can use
-     * this method with any request header.
-     *
-     * @param name		a <code>String</code> specifying the
-     *				header name
-     *
-     * @return			an <code>Enumeration</code> containing
-     *                  	the values of the requested header. If
-     *                  	the request does not have any headers of
-     *                  	that name return an empty
-     *                  	enumeration. If 
-     *                  	the container does not allow access to
-     *                  	header information, return null
-     *
-     */			
-
-    public Enumeration<String> getHeaders(String name); 
-    
-    
-    
-    
-
-    /**
-     *
-     * Returns an enumeration of all the header names
-     * this request contains. If the request has no
-     * headers, this method returns an empty enumeration.
-     *
-     * <p>Some servlet containers do not allow
-     * servlets to access headers using this method, in
-     * which case this method returns <code>null</code>
-     *
-     * @return			an enumeration of all the
-     *				header names sent with this
-     *				request; if the request has
-     *				no headers, an empty enumeration;
-     *				if the servlet container does not
-     *				allow servlets to use this method,
-     *				<code>null</code>
-     *				
-     *
+     * Returns an enumeration of all the header names this request contains. If
+     * the request has no headers, this method returns an empty enumeration.
+     * <p>
+     * Some servlet containers do not allow servlets to access headers using
+     * this method, in which case this method returns <code>null</code>
+     * 
+     * @return an enumeration of all the header names sent with this request; if
+     *         the request has no headers, an empty enumeration; if the servlet
+     *         container does not allow servlets to use this method,
+     *         <code>null</code>
      */
-
     public Enumeration<String> getHeaderNames();
-    
-    
-    
 
     /**
-     *
-     * Returns the value of the specified request header
-     * as an <code>int</code>. If the request does not have a header
-     * of the specified name, this method returns -1. If the
-     * header cannot be converted to an integer, this method
+     * Returns the value of the specified request header as an <code>int</code>.
+     * If the request does not have a header of the specified name, this method
+     * returns -1. If the header cannot be converted to an integer, this method
      * throws a <code>NumberFormatException</code>.
-     *
-     * <p>The header name is case insensitive.
-     *
-     * @param name		a <code>String</code> specifying the name
-     *				of a request header
-     *
-     * @return			an integer expressing the value 
-     * 				of the request header or -1
-     *				if the request doesn't have a
-     *				header of this name
-     *
-     * @exception	NumberFormatException		If the header value
-     *							can't be converted
-     *							to an <code>int</code>
+     * <p>
+     * The header name is case insensitive.
+     * 
+     * @param name
+     *            a <code>String</code> specifying the name of a request header
+     * @return an integer expressing the value of the request header or -1 if the
+     *         request doesn't have a header of this name
+     * @exception NumberFormatException
+     *                If the header value can't be converted to an
+     *                <code>int</code>
      */
-
     public int getIntHeader(String name);
-    
-    
-    
-
-    /**
-     *
-     * Returns the name of the HTTP method with which this 
-     * request was made, for example, GET, POST, or PUT.
-     * Same as the value of the CGI variable REQUEST_METHOD.
-     *
-     * @return			a <code>String</code> 
-     *				specifying the name
-     *				of the method with which
-     *				this request was made
-     *
+
+    /**
+     * Returns the name of the HTTP method with which this request was made, for
+     * example, GET, POST, or PUT. Same as the value of the CGI variable
+     * REQUEST_METHOD.
+     * 
+     * @return a <code>String</code> specifying the name of the method with
+     *         which this request was made
      */
- 
     public String getMethod();
-    
-    
-    
-
-    /**
-     *
-     * Returns any extra path information associated with
-     * the URL the client sent when it made this request.
-     * The extra path information follows the servlet path
-     * but precedes the query string and will start with
-     * a "/" character.
-     *
-     * <p>This method returns <code>null</code> if there
-     * was no extra path information.
-     *
-     * <p>Same as the value of the CGI variable PATH_INFO.
-     *
-     *
-     * @return		a <code>String</code>, decoded by the
-     *			web container, specifying 
-     *			extra path information that comes
-     *			after the servlet path but before
-     *			the query string in the request URL;
-     *			or <code>null</code> if the URL does not have
-     *			any extra path information
-     *
+
+    /**
+     * Returns any extra path information associated with the URL the client
+     * sent when it made this request. The extra path information follows the
+     * servlet path but precedes the query string and will start with a "/"
+     * character.
+     * <p>
+     * This method returns <code>null</code> if there was no extra path
+     * information.
+     * <p>
+     * Same as the value of the CGI variable PATH_INFO.
+     * 
+     * @return a <code>String</code>, decoded by the web container, specifying
+     *         extra path information that comes after the servlet path but
+     *         before the query string in the request URL; or <code>null</code>
+     *         if the URL does not have any extra path information
      */
-     
     public String getPathInfo();
-    
-
- 
 
     /**
-     *
-     * Returns any extra path information after the servlet name
-     * but before the query string, and translates it to a real
-     * path. Same as the value of the CGI variable PATH_TRANSLATED.
-     *
-     * <p>If the URL does not have any extra path information,
-     * this method returns <code>null</code> or the servlet container
-     * cannot translate the virtual path to a real path for any reason
-     * (such as when the web application is executed from an archive).
-     *
-     * The web container does not decode this string.
-     *
-     *
-     * @return		a <code>String</code> specifying the
-     *			real path, or <code>null</code> if
-     *			the URL does not have any extra path
-     *			information
-     *
-     *
+     * Returns any extra path information after the servlet name but before the
+     * query string, and translates it to a real path. Same as the value of the
+     * CGI variable PATH_TRANSLATED.
+     * <p>
+     * If the URL does not have any extra path information, this method returns
+     * <code>null</code> or the servlet container cannot translate the virtual
+     * path to a real path for any reason (such as when the web application is
+     * executed from an archive). The web container does not decode this string.
+     * 
+     * @return a <code>String</code> specifying the real path, or
+     *         <code>null</code> if the URL does not have any extra path
+     *         information
      */
-
     public String getPathTranslated();
-    
-
- 
 
     /**
-     *
-     * Returns the portion of the request URI that indicates the context
-     * of the request.  The context path always comes first in a request
-     * URI.  The path starts with a "/" character but does not end with a "/"
-     * character.  For servlets in the default (root) context, this method
-     * returns "". The container does not decode this string.
-     *
-     *
-     * @return		a <code>String</code> specifying the
-     *			portion of the request URI that indicates the context
-     *			of the request
-     *
-     *
+     * Returns the portion of the request URI that indicates the context of the
+     * request. The context path always comes first in a request URI. The path
+     * starts with a "/" character but does not end with a "/" character. For
+     * servlets in the default (root) context, this method returns "". The
+     * container does not decode this string.
+     * 
+     * @return a <code>String</code> specifying the portion of the request URI
+     *         that indicates the context of the request
      */
-
     public String getContextPath();
-    
-    
-    
-
-    /**
-     *
-     * Returns the query string that is contained in the request
-     * URL after the path. This method returns <code>null</code>
-     * if the URL does not have a query string. Same as the value
-     * of the CGI variable QUERY_STRING. 
-     *
-     * @return		a <code>String</code> containing the query
-     *			string or <code>null</code> if the URL 
-     *			contains no query string. The value is not
-     *			decoded by the container.
-     *
-     */
 
-    public String getQueryString();
-    
-    
-    
-
-    /**
-     *
-     * Returns the login of the user making this request, if the
-     * user has been authenticated, or <code>null</code> if the user 
-     * has not been authenticated.
-     * Whether the user name is sent with each subsequent request
-     * depends on the browser and type of authentication. Same as the 
-     * value of the CGI variable REMOTE_USER.
-     *
-     * @return		a <code>String</code> specifying the login
-     *			of the user making this request, or <code>null</code>
-     *			if the user login is not known
-     *
+    /**
+     * Returns the query string that is contained in the request URL after the
+     * path. This method returns <code>null</code> if the URL does not have a
+     * query string. Same as the value of the CGI variable QUERY_STRING.
+     * 
+     * @return a <code>String</code> containing the query string or
+     *         <code>null</code> if the URL contains no query string. The value
+     *         is not decoded by the container.
      */
+    public String getQueryString();
 
+    /**
+     * Returns the login of the user making this request, if the user has been
+     * authenticated, or <code>null</code> if the user has not been
+     * authenticated. Whether the user name is sent with each subsequent request
+     * depends on the browser and type of authentication. Same as the value of
+     * the CGI variable REMOTE_USER.
+     * 
+     * @return a <code>String</code> specifying the login of the user making
+     *         this request, or <code>null</code> if the user login is not known
+     */
     public String getRemoteUser();
-    
-    
-    
 
     /**
-     *
      * Returns a boolean indicating whether the authenticated user is included
-     * in the specified logical "role".  Roles and role membership can be
-     * defined using deployment descriptors.  If the user has not been
-     * authenticated, the method returns <code>false</code>.
-     *
-     * @param role		a <code>String</code> specifying the name
-     *				of the role
-     *
-     * @return		a <code>boolean</code> indicating whether
-     *			the user making this request belongs to a given role;
-     *			<code>false</code> if the user has not been 
-     *			authenticated
-     *
+     * in the specified logical "role". Roles and role membership can be defined
+     * using deployment descriptors. If the user has not been authenticated, the
+     * method returns <code>false</code>.
+     * 
+     * @param role
+     *            a <code>String</code> specifying the name of the role
+     * @return a <code>boolean</code> indicating whether the user making this
+     *         request belongs to a given role; <code>false</code> if the user
+     *         has not been authenticated
      */
-
     public boolean isUserInRole(String role);
-    
-    
-    
 
     /**
-     *
-     * Returns a <code>java.security.Principal</code> object containing
-     * the name of the current authenticated user. If the user has not been
+     * Returns a <code>java.security.Principal</code> object containing the name
+     * of the current authenticated user. If the user has not been
      * authenticated, the method returns <code>null</code>.
-     *
-     * @return		a <code>java.security.Principal</code> containing
-     *			the name of the user making this request;
-     *			<code>null</code> if the user has not been 
-     *			authenticated
-     *
+     * 
+     * @return a <code>java.security.Principal</code> containing the name of the
+     *         user making this request; <code>null</code> if the user has not
+     *         been authenticated
      */
-
     public java.security.Principal getUserPrincipal();
-    
-    
-    
-
-    /**
-     *
-     * Returns the session ID specified by the client. This may
-     * not be the same as the ID of the current valid session
-     * for this request.
-     * If the client did not specify a session ID, this method returns
-     * <code>null</code>.
-     *
-     *
-     * @return		a <code>String</code> specifying the session
-     *			ID, or <code>null</code> if the request did
-     *			not specify a session ID
-     *
-     * @see		#isRequestedSessionIdValid
-     *
-     */
 
-    public String getRequestedSessionId();
-    
-    
-    
-    
-    /**
-     *
-     * Returns the part of this request's URL from the protocol
-     * name up to the query string in the first line of the HTTP request.
-     * The web container does not decode this String.
-     * For example:
-     *
+    /**
+     * Returns the session ID specified by the client. This may not be the same
+     * as the ID of the current valid session for this request. If the client
+     * did not specify a session ID, this method returns <code>null</code>.
      * 
+     * @return a <code>String</code> specifying the session ID, or
+     *         <code>null</code> if the request did not specify a session ID
+     * @see #isRequestedSessionIdValid
+     */
+    public String getRequestedSessionId();
 
+    /**
+     * Returns the part of this request's URL from the protocol name up to the
+     * query string in the first line of the HTTP request. The web container
+     * does not decode this String. For example:
      * <table summary="Examples of Returned Values">
-     * <tr align=left><th>First line of HTTP request      </th>
-     * <th>     Returned Value</th>
-     * <tr><td>POST /some/path.html HTTP/1.1<td><td>/some/path.html
-     * <tr><td>GET http://foo.bar/a.html HTTP/1.0
-     * <td><td>/a.html
-     * <tr><td>HEAD /xyz?a=b HTTP/1.1<td><td>/xyz
+     * <tr align=left>
+     * <th>First line of HTTP request</th>
+     * <th>Returned Value</th>
+     * <tr>
+     * <td>POST /some/path.html HTTP/1.1
+     * <td>
+     * <td>/some/path.html
+     * <tr>
+     * <td>GET http://foo.bar/a.html HTTP/1.0
+     * <td>
+     * <td>/a.html
+     * <tr>
+     * <td>HEAD /xyz?a=b HTTP/1.1
+     * <td>
+     * <td>/xyz
      * </table>
-     *
-     * <p>To reconstruct an URL with a scheme and host, use
+     * <p>
+     * To reconstruct an URL with a scheme and host, use
      * {@link HttpUtils#getRequestURL}.
-     *
-     * @return		a <code>String</code> containing
-     *			the part of the URL from the 
-     *			protocol name up to the query string
-     *
-     * @see		HttpUtils#getRequestURL
-     *
+     * 
+     * @return a <code>String</code> containing the part of the URL from the
+     *         protocol name up to the query string
+     * @see HttpUtils#getRequestURL
      */
-
     public String getRequestURI();
-    
+
     /**
-     *
-     * Reconstructs the URL the client used to make the request.
-     * The returned URL contains a protocol, server name, port
-     * number, and server path, but it does not include query
-     * string parameters.
-     *
-     * <p>Because this method returns a <code>StringBuffer</code>,
-     * not a string, you can modify the URL easily, for example,
-     * to append query parameters.
-     *
-     * <p>This method is useful for creating redirect messages
-     * and for reporting errors.
-     *
-     * @return		a <code>StringBuffer</code> object containing
-     *			the reconstructed URL
-     *
+     * Reconstructs the URL the client used to make the request. The returned
+     * URL contains a protocol, server name, port number, and server path, but
+     * it does not include query string parameters.
+     * <p>
+     * Because this method returns a <code>StringBuffer</code>, not a string,
+     * you can modify the URL easily, for example, to append query parameters.
+     * <p>
+     * This method is useful for creating redirect messages and for reporting
+     * errors.
+     * 
+     * @return a <code>StringBuffer</code> object containing the reconstructed
+     *         URL
      */
     public StringBuffer getRequestURL();
-    
 
     /**
-     *
-     * Returns the part of this request's URL that calls
-     * the servlet. This path starts with a "/" character
-     * and includes either the servlet name or a path to
-     * the servlet, but does not include any extra path
-     * information or a query string. Same as the value of
-     * the CGI variable SCRIPT_NAME.
-     *
-     * <p>This method will return an empty string ("") if the
-     * servlet used to process this request was matched using
-     * the "/*" pattern.
-     *
-     * @return		a <code>String</code> containing
-     *			the name or path of the servlet being
-     *			called, as specified in the request URL,
-     *			decoded, or an empty string if the servlet
-     *			used to process the request is matched
-     *			using the "/*" pattern.
-     *
+     * Returns the part of this request's URL that calls the servlet. This path
+     * starts with a "/" character and includes either the servlet name or a
+     * path to the servlet, but does not include any extra path information or a
+     * query string. Same as the value of the CGI variable SCRIPT_NAME.
+     * <p>
+     * This method will return an empty string ("") if the servlet used to
+     * process this request was matched using the "/*" pattern.
+     * 
+     * @return a <code>String</code> containing the name or path of the servlet
+     *         being called, as specified in the request URL, decoded, or an
+     *         empty string if the servlet used to process the request is
+     *         matched using the "/*" pattern.
      */
-
     public String getServletPath();
-    
-    
-    
-
-    /**
-     *
-     * Returns the current <code>HttpSession</code>
-     * associated with this request or, if there is no
-     * current session and <code>create</code> is true, returns 
-     * a new session.
-     *
-     * <p>If <code>create</code> is <code>false</code>
-     * and the request has no valid <code>HttpSession</code>,
-     * this method returns <code>null</code>.
-     *
-     * <p>To make sure the session is properly maintained,
-     * you must call this method before 
-     * the response is committed. If the container is using cookies
-     * to maintain session integrity and is asked to create a new session
-     * when the response is committed, an IllegalStateException is thrown.
-     *
-     *
-     *
-     *
-     * @param create	<code>true</code> to create
-     *			a new session for this request if necessary; 
-     *			<code>false</code> to return <code>null</code>
-     *			if there's no current session
-     *			
-     *
-     * @return 		the <code>HttpSession</code> associated 
-     *			with this request or <code>null</code> if
-     * 			<code>create</code> is <code>false</code>
-     *			and the request has no valid session
-     *
-     * @see	#getSession()
-     *
-     *
-     */
 
+    /**
+     * Returns the current <code>HttpSession</code> associated with this request
+     * or, if there is no current session and <code>create</code> is true,
+     * returns a new session.
+     * <p>
+     * If <code>create</code> is <code>false</code> and the request has no valid
+     * <code>HttpSession</code>, this method returns <code>null</code>.
+     * <p>
+     * To make sure the session is properly maintained, you must call this
+     * method before the response is committed. If the container is using
+     * cookies to maintain session integrity and is asked to create a new
+     * session when the response is committed, an IllegalStateException is
+     * thrown.
+     * 
+     * @param create
+     *            <code>true</code> to create a new session for this request if
+     *            necessary; <code>false</code> to return <code>null</code> if
+     *            there's no current session
+     * @return the <code>HttpSession</code> associated with this request or
+     *         <code>null</code> if <code>create</code> is <code>false</code>
+     *         and the request has no valid session
+     * @see #getSession()
+     */
     public HttpSession getSession(boolean create);
-    
-    
-    
-   
 
     /**
-     *
-     * Returns the current session associated with this request,
-     * or if the request does not have a session, creates one.
-     * 
-     * @return		the <code>HttpSession</code> associated
-     *			with this request
-     *
-     * @see	#getSession(boolean)
-     *
+     * Returns the current session associated with this request, or if the
+     * request does not have a session, creates one.
+     * 
+     * @return the <code>HttpSession</code> associated with this request
+     * @see #getSession(boolean)
      */
-
     public HttpSession getSession();
-    
-    
-    
-    
-    
 
     /**
-     *
      * Checks whether the requested session ID is still valid.
-     *
-     * @return			<code>true</code> if this
-     *				request has an id for a valid session
-     *				in the current session context;
-     *				<code>false</code> otherwise
-     *
-     * @see			#getRequestedSessionId
-     * @see			#getSession
-     * @see			HttpSessionContext
-     *
+     * 
+     * @return <code>true</code> if this request has an id for a valid session
+     *         in the current session context; <code>false</code> otherwise
+     * @see #getRequestedSessionId
+     * @see #getSession
+     * @see HttpSessionContext
      */
-
     public boolean isRequestedSessionIdValid();
-    
-    
-    
 
     /**
-     *
      * Checks whether the requested session ID came in as a cookie.
-     *
-     * @return			<code>true</code> if the session ID
-     *				came in as a
-     *				cookie; otherwise, <code>false</code>
-     *
-     *
-     * @see			#getSession
-     *
-     */ 
-
+     * 
+     * @return <code>true</code> if the session ID came in as a cookie;
+     *         otherwise, <code>false</code>
+     * @see #getSession
+     */
     public boolean isRequestedSessionIdFromCookie();
-    
-    
-    
-
-    /**
-     *
-     * Checks whether the requested session ID came in as part of the 
-     * request URL.
-     *
-     * @return			<code>true</code> if the session ID
-     *				came in as part of a URL; otherwise,
-     *				<code>false</code>
-     *
-     *
-     * @see			#getSession
-     *
+
+    /**
+     * Checks whether the requested session ID came in as part of the request
+     * URL.
+     * 
+     * @return <code>true</code> if the session ID came in as part of a URL;
+     *         otherwise, <code>false</code>
+     * @see #getSession
      */
-    
     public boolean isRequestedSessionIdFromURL();
-    
-    
-    
-    
-    
-    /**
-     *
-     * @deprecated		As of Version 2.1 of the Java Servlet
-     *				API, use {@link #isRequestedSessionIdFromURL}
-     *				instead.
-     *
+
+    /**
+     * @deprecated As of Version 2.1 of the Java Servlet API, use
+     *             {@link #isRequestedSessionIdFromURL} instead.
      */
-    @SuppressWarnings("dep-ann") // Spec API does not use @Deprecated
+    @SuppressWarnings("dep-ann")
+    // Spec API does not use @Deprecated
     public boolean isRequestedSessionIdFromUrl();
 
-
     /**
-     * 
      * @param response
      * @return
      * @throws IOException
      * @throws ServletException
-     * @since Servlet 3.0
-     * TODO SERVLET3 - Add comments
+     * @since Servlet 3.0 TODO SERVLET3 - Add comments
      */
     public boolean authenticate(HttpServletResponse response)
-    throws IOException, ServletException;
-    
-    
+            throws IOException, ServletException;
+
     /**
-     * 
      * @param username
      * @param password
-     * @throws ServletException If any of {@link #getRemoteUser()},
-     *         {@link #getUserPrincipal()} or {@link #getAuthType()} are
-     *         non-null, if the configured authenticator does not support
-     *         user name and password authentication or if the authentication
-     *         fails
-     * @since Servlet 3.0
-     * TODO SERVLET3 - Add comments
+     * @throws ServletException
+     *             If any of {@link #getRemoteUser()},
+     *             {@link #getUserPrincipal()} or {@link #getAuthType()} are
+     *             non-null, if the configured authenticator does not support
+     *             user name and password authentication or if the
+     *             authentication fails
+     * @since Servlet 3.0 TODO SERVLET3 - Add comments
      */
-    public void login(String username, String password)
-    throws ServletException;
-    
-    
+    public void login(String username, String password) throws ServletException;
+
     /**
-     * 
-     * @throws ServletException If the logout fails
-     * @since Servlet 3.0
-     * TODO SERVLET3 - Add comments
+     * @throws ServletException
+     *             If the logout fails
+     * @since Servlet 3.0 TODO SERVLET3 - Add comments
      */
     public void logout() throws ServletException;
-    
-    
+
     /**
      * Return a collection of all uploaded Parts.
+     * 
      * @return
-     * @throws IOException           if an I/O error occurs
-     * @throws IllegalStateException if size limits are exceeded
-     * @throws ServletException      if the request is not multipart/form-data
+     * @throws IOException
+     *             if an I/O error occurs
+     * @throws IllegalStateException
+     *             if size limits are exceeded
+     * @throws ServletException
+     *             if the request is not multipart/form-data
      * @since Servlet 3.0
      */
     public Collection<Part> getParts() throws IOException,
             IllegalStateException, ServletException;
-    
-    
+
     /**
      * Gets the named Part or null if the Part does not exist. Triggers upload
-     * of all Parts. 
+     * of all Parts.
+     * 
      * @param name
      * @return
-     * @throws IOException           if an I/O error occurs
-     * @throws IllegalStateException if size limits are exceeded
-     * @throws ServletException      if the request is not multipart/form-data
+     * @throws IOException
+     *             if an I/O error occurs
+     * @throws IllegalStateException
+     *             if size limits are exceeded
+     * @throws ServletException
+     *             if the request is not multipart/form-data
      * @since Servlet 3.0
      */
     public Part getPart(String name) throws IOException, IllegalStateException,
-            ServletException; 
+            ServletException;
 }

Modified: tomcat/trunk/java/javax/servlet/http/HttpServletRequestWrapper.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/http/HttpServletRequestWrapper.java?rev=967146&r1=967145&r2=967146&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/http/HttpServletRequestWrapper.java (original)
+++ tomcat/trunk/java/javax/servlet/http/HttpServletRequestWrapper.java Fri Jul 23 16:03:25 2010
@@ -1,19 +1,19 @@
 /*
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements.  See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License.  You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package javax.servlet.http;
 
 import javax.servlet.ServletException;
@@ -24,275 +24,259 @@ import java.util.Collection;
 import java.util.Enumeration;
 
 /**
- * 
  * Provides a convenient implementation of the HttpServletRequest interface that
  * can be subclassed by developers wishing to adapt the request to a Servlet.
  * This class implements the Wrapper or Decorator pattern. Methods default to
  * calling through to the wrapped request object.
  * 
- *
- * @see 	javax.servlet.http.HttpServletRequest
-  * @since	v 2.3
- *
+ * @see javax.servlet.http.HttpServletRequest
+ * @since v 2.3
  */
+public class HttpServletRequestWrapper extends ServletRequestWrapper implements
+        HttpServletRequest {
 
-
-public class HttpServletRequestWrapper extends ServletRequestWrapper implements HttpServletRequest {
-
-	/** 
-	* Constructs a request object wrapping the given request.
-	* @throws java.lang.IllegalArgumentException if the request is null
-	*/
+    /**
+     * Constructs a request object wrapping the given request.
+     * 
+     * @throws java.lang.IllegalArgumentException
+     *             if the request is null
+     */
     public HttpServletRequestWrapper(HttpServletRequest request) {
-	    super(request);
+        super(request);
     }
-    
+
     private HttpServletRequest _getHttpServletRequest() {
-	return (HttpServletRequest) super.getRequest();
+        return (HttpServletRequest) super.getRequest();
     }
 
     /**
-     * The default behavior of this method is to return getAuthType()
-     * on the wrapped request object.
+     * The default behavior of this method is to return getAuthType() on the
+     * wrapped request object.
      */
-
     public String getAuthType() {
-	return this._getHttpServletRequest().getAuthType();
+        return this._getHttpServletRequest().getAuthType();
     }
-   
+
     /**
-     * The default behavior of this method is to return getCookies()
-     * on the wrapped request object.
+     * The default behavior of this method is to return getCookies() on the
+     * wrapped request object.
      */
     public Cookie[] getCookies() {
-	return this._getHttpServletRequest().getCookies();
+        return this._getHttpServletRequest().getCookies();
     }
 
     /**
-     * The default behavior of this method is to return getDateHeader(String name)
-     * on the wrapped request object.
+     * The default behavior of this method is to return getDateHeader(String
+     * name) on the wrapped request object.
      */
     public long getDateHeader(String name) {
-	return this._getHttpServletRequest().getDateHeader(name);
+        return this._getHttpServletRequest().getDateHeader(name);
     }
-        	
+
     /**
      * The default behavior of this method is to return getHeader(String name)
      * on the wrapped request object.
      */
     public String getHeader(String name) {
-	return this._getHttpServletRequest().getHeader(name);
+        return this._getHttpServletRequest().getHeader(name);
     }
-    
+
     /**
      * The default behavior of this method is to return getHeaders(String name)
      * on the wrapped request object.
      */
     public Enumeration<String> getHeaders(String name) {
-	return this._getHttpServletRequest().getHeaders(name);
-    }  
+        return this._getHttpServletRequest().getHeaders(name);
+    }
 
     /**
-     * The default behavior of this method is to return getHeaderNames()
-     * on the wrapped request object.
+     * The default behavior of this method is to return getHeaderNames() on the
+     * wrapped request object.
      */
-  
     public Enumeration<String> getHeaderNames() {
-	return this._getHttpServletRequest().getHeaderNames();
+        return this._getHttpServletRequest().getHeaderNames();
     }
-    
+
     /**
-     * The default behavior of this method is to return getIntHeader(String name)
-     * on the wrapped request object.
+     * The default behavior of this method is to return getIntHeader(String
+     * name) on the wrapped request object.
      */
-
-     public int getIntHeader(String name) {
-	return this._getHttpServletRequest().getIntHeader(name);
+    public int getIntHeader(String name) {
+        return this._getHttpServletRequest().getIntHeader(name);
     }
-    
+
     /**
-     * The default behavior of this method is to return getMethod()
-     * on the wrapped request object.
+     * The default behavior of this method is to return getMethod() on the
+     * wrapped request object.
      */
     public String getMethod() {
-	return this._getHttpServletRequest().getMethod();
+        return this._getHttpServletRequest().getMethod();
     }
-    
+
     /**
-     * The default behavior of this method is to return getPathInfo()
-     * on the wrapped request object.
+     * The default behavior of this method is to return getPathInfo() on the
+     * wrapped request object.
      */
     public String getPathInfo() {
-	return this._getHttpServletRequest().getPathInfo();
+        return this._getHttpServletRequest().getPathInfo();
     }
 
     /**
-     * The default behavior of this method is to return getPathTranslated()
-     * on the wrapped request object.
+     * The default behavior of this method is to return getPathTranslated() on
+     * the wrapped request object.
      */
-
-     public String getPathTranslated() {
-	return this._getHttpServletRequest().getPathTranslated();
+    public String getPathTranslated() {
+        return this._getHttpServletRequest().getPathTranslated();
     }
 
     /**
-     * The default behavior of this method is to return getContextPath()
-     * on the wrapped request object.
+     * The default behavior of this method is to return getContextPath() on the
+     * wrapped request object.
      */
     public String getContextPath() {
-	return this._getHttpServletRequest().getContextPath();
+        return this._getHttpServletRequest().getContextPath();
     }
-    
+
     /**
-     * The default behavior of this method is to return getQueryString()
-     * on the wrapped request object.
+     * The default behavior of this method is to return getQueryString() on the
+     * wrapped request object.
      */
     public String getQueryString() {
-	return this._getHttpServletRequest().getQueryString();
+        return this._getHttpServletRequest().getQueryString();
     }
-    
+
     /**
-     * The default behavior of this method is to return getRemoteUser()
-     * on the wrapped request object.
+     * The default behavior of this method is to return getRemoteUser() on the
+     * wrapped request object.
      */
     public String getRemoteUser() {
-	return this._getHttpServletRequest().getRemoteUser();
+        return this._getHttpServletRequest().getRemoteUser();
     }
-    
- 
+
     /**
-     * The default behavior of this method is to return isUserInRole(String role)
-     * on the wrapped request object.
+     * The default behavior of this method is to return isUserInRole(String
+     * role) on the wrapped request object.
      */
     public boolean isUserInRole(String role) {
-	return this._getHttpServletRequest().isUserInRole(role);
+        return this._getHttpServletRequest().isUserInRole(role);
     }
-    
-    
-    
+
     /**
-     * The default behavior of this method is to return getUserPrincipal()
-     * on the wrapped request object.
+     * The default behavior of this method is to return getUserPrincipal() on
+     * the wrapped request object.
      */
     public java.security.Principal getUserPrincipal() {
-	return this._getHttpServletRequest().getUserPrincipal();
+        return this._getHttpServletRequest().getUserPrincipal();
     }
-    
-   
+
     /**
      * The default behavior of this method is to return getRequestedSessionId()
      * on the wrapped request object.
      */
     public String getRequestedSessionId() {
-	return this._getHttpServletRequest().getRequestedSessionId();
+        return this._getHttpServletRequest().getRequestedSessionId();
     }
-    
+
     /**
-     * The default behavior of this method is to return getRequestURI()
-     * on the wrapped request object.
+     * The default behavior of this method is to return getRequestURI() on the
+     * wrapped request object.
      */
     public String getRequestURI() {
-	return this._getHttpServletRequest().getRequestURI();
+        return this._getHttpServletRequest().getRequestURI();
     }
-	/**
-     * The default behavior of this method is to return getRequestURL()
-     * on the wrapped request object.
+
+    /**
+     * The default behavior of this method is to return getRequestURL() on the
+     * wrapped request object.
      */
     public StringBuffer getRequestURL() {
-	return this._getHttpServletRequest().getRequestURL();
+        return this._getHttpServletRequest().getRequestURL();
     }
-	
-    
+
     /**
-     * The default behavior of this method is to return getServletPath()
-     * on the wrapped request object.
+     * The default behavior of this method is to return getServletPath() on the
+     * wrapped request object.
      */
     public String getServletPath() {
-	return this._getHttpServletRequest().getServletPath();
+        return this._getHttpServletRequest().getServletPath();
     }
-    
-    
+
     /**
-     * The default behavior of this method is to return getSession(boolean create)
-     * on the wrapped request object.
+     * The default behavior of this method is to return getSession(boolean
+     * create) on the wrapped request object.
      */
     public HttpSession getSession(boolean create) {
-	return this._getHttpServletRequest().getSession(create);
+        return this._getHttpServletRequest().getSession(create);
     }
-    
+
     /**
-     * The default behavior of this method is to return getSession()
-     * on the wrapped request object.
+     * The default behavior of this method is to return getSession() on the
+     * wrapped request object.
      */
     public HttpSession getSession() {
-	return this._getHttpServletRequest().getSession();
+        return this._getHttpServletRequest().getSession();
     }
-    
-    /**
-     * The default behavior of this method is to return isRequestedSessionIdValid()
-     * on the wrapped request object.
-     */ 
 
+    /**
+     * The default behavior of this method is to return
+     * isRequestedSessionIdValid() on the wrapped request object.
+     */
     public boolean isRequestedSessionIdValid() {
-	return this._getHttpServletRequest().isRequestedSessionIdValid();
+        return this._getHttpServletRequest().isRequestedSessionIdValid();
     }
-     
-    
+
     /**
-     * The default behavior of this method is to return isRequestedSessionIdFromCookie()
-     * on the wrapped request object.
+     * The default behavior of this method is to return
+     * isRequestedSessionIdFromCookie() on the wrapped request object.
      */
     public boolean isRequestedSessionIdFromCookie() {
-	return this._getHttpServletRequest().isRequestedSessionIdFromCookie();
+        return this._getHttpServletRequest().isRequestedSessionIdFromCookie();
     }
-    
-    	  /**
-     * The default behavior of this method is to return isRequestedSessionIdFromURL()
-     * on the wrapped request object.
-     */ 
+
+    /**
+     * The default behavior of this method is to return
+     * isRequestedSessionIdFromURL() on the wrapped request object.
+     */
     public boolean isRequestedSessionIdFromURL() {
-	return this._getHttpServletRequest().isRequestedSessionIdFromURL();
+        return this._getHttpServletRequest().isRequestedSessionIdFromURL();
     }
-    
+
     /**
-     * The default behavior of this method is to return isRequestedSessionIdFromUrl()
-     * on the wrapped request object.
+     * The default behavior of this method is to return
+     * isRequestedSessionIdFromUrl() on the wrapped request object.
+     * 
      * @deprecated As of Version 3.0 of the Java Servlet API
      */
-    @SuppressWarnings("dep-ann") // Spec API does not use @Deprecated
+    @SuppressWarnings("dep-ann")
+    // Spec API does not use @Deprecated
     public boolean isRequestedSessionIdFromUrl() {
-	return this._getHttpServletRequest().isRequestedSessionIdFromUrl();
+        return this._getHttpServletRequest().isRequestedSessionIdFromUrl();
     }
 
     /**
-     * @since Servlet 3.0
-     * TODO SERVLET3 - Add comments
+     * @since Servlet 3.0 TODO SERVLET3 - Add comments
      */
     public boolean authenticate(HttpServletResponse response)
-    throws IOException, ServletException {
+            throws IOException, ServletException {
         return this._getHttpServletRequest().authenticate(response);
     }
 
     /**
-     * @since Servlet 3.0
-     * TODO SERVLET3 - Add comments
+     * @since Servlet 3.0 TODO SERVLET3 - Add comments
      */
     public void login(String username, String password) throws ServletException {
         this._getHttpServletRequest().login(username, password);
     }
 
     /**
-     * @since Servlet 3.0
-     * TODO SERVLET3 - Add comments
+     * @since Servlet 3.0 TODO SERVLET3 - Add comments
      */
     public void logout() throws ServletException {
         this._getHttpServletRequest().logout();
     }
 
-
     /**
-     * @since Servlet 3.0
-     * TODO SERVLET3 - Add comments
+     * @since Servlet 3.0 TODO SERVLET3 - Add comments
      */
     public Collection<Part> getParts() throws IllegalStateException,
             IOException, ServletException {
@@ -300,15 +284,13 @@ public class HttpServletRequestWrapper e
     }
 
     /**
-     * @throws ServletException 
-     * @throws IOException 
-     * @throws IllegalStateException 
-     * @since Servlet 3.0
-     * TODO SERVLET3 - Add comments
+     * @throws ServletException
+     * @throws IOException
+     * @throws IllegalStateException
+     * @since Servlet 3.0 TODO SERVLET3 - Add comments
      */
     public Part getPart(String name) throws IllegalStateException, IOException,
             ServletException {
         return this._getHttpServletRequest().getPart(name);
     }
-
 }



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


Mime
View raw message