svn commit: r1711022 - in /tomcat/trunk/java/javax/servlet: ServletRequest.java ServletRequestWrapper.java

[kkolinko]

Author: kkolinko
Date: Wed Oct 28 14:38:59 2015
New Revision: 1711022

URL: http://svn.apache.org/viewvc?rev=1711022&view=rev
Log:
Add @since annotation to request.getContentLengthLong() method and update some 
javadocs. This method is since Tomcat 8 / Servlet 3.1.

Modified:
    tomcat/trunk/java/javax/servlet/ServletRequest.java
    tomcat/trunk/java/javax/servlet/ServletRequestWrapper.java

Modified: tomcat/trunk/java/javax/servlet/ServletRequest.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/ServletRequest.java?rev=1711022&r1=1711021&r2=1711022&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/ServletRequest.java (original)
+++ tomcat/trunk/java/javax/servlet/ServletRequest.java Wed Oct 28 14:38:59 2015
@@ -116,6 +116,7 @@ public interface ServletRequest {
      *
      * @return a long integer containing the length of the request body or -1 
if
      *         the length is not known
+     * @since Servlet 3.1
      */
     public long getContentLengthLong();
 
@@ -409,7 +410,7 @@ public interface ServletRequest {
      * proxy that sent the request.
      *
      * @return an integer specifying the port number
-     * @since 2.4
+     * @since Servlet 2.4
      */
     public int getRemotePort();
 
@@ -419,7 +420,7 @@ public interface ServletRequest {
      *
      * @return a <code>String</code> containing the host name of the IP on 
which
      *         the request was received.
-     * @since 2.4
+     * @since Servlet 2.4
      */
     public String getLocalName();
 
@@ -429,7 +430,7 @@ public interface ServletRequest {
      *
      * @return a <code>String</code> containing the IP address on which the
      *         request was received.
-     * @since 2.4
+     * @since Servlet 2.4
      */
     public String getLocalAddr();
 
@@ -438,7 +439,7 @@ public interface ServletRequest {
      * the request was received.
      *
      * @return an integer specifying the port number
-     * @since 2.4
+     * @since Servlet 2.4
      */
     public int getLocalPort();
 

Modified: tomcat/trunk/java/javax/servlet/ServletRequestWrapper.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/ServletRequestWrapper.java?rev=1711022&r1=1711021&r2=1711022&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/ServletRequestWrapper.java (original)
+++ tomcat/trunk/java/javax/servlet/ServletRequestWrapper.java Wed Oct 28 
14:38:59 2015
@@ -28,7 +28,7 @@ import java.util.Map;
  * class implements the Wrapper or Decorator pattern. Methods default to 
calling
  * through to the wrapped request object.
  *
- * @since v 2.3
+ * @since Servlet 2.3
  * @see javax.servlet.ServletRequest
  */
 public class ServletRequestWrapper implements ServletRequest {
@@ -115,6 +115,12 @@ public class ServletRequestWrapper imple
         return this.request.getContentLength();
     }
 
+    /**
+     * The default behavior of this method is to return getContentLengthLong()
+     * on the wrapped request object.
+     *
+     * @since Servlet 3.1
+     */
     @Override
     public long getContentLengthLong() {
         return this.request.getContentLengthLong();
@@ -307,7 +313,7 @@ public class ServletRequestWrapper imple
      * The default behavior of this method is to return getRemotePort() on the
      * wrapped request object.
      *
-     * @since 2.4
+     * @since Servlet 2.4
      */
     @Override
     public int getRemotePort() {
@@ -318,7 +324,7 @@ public class ServletRequestWrapper imple
      * The default behavior of this method is to return getLocalName() on the
      * wrapped request object.
      *
-     * @since 2.4
+     * @since Servlet 2.4
      */
     @Override
     public String getLocalName() {
@@ -329,7 +335,7 @@ public class ServletRequestWrapper imple
      * The default behavior of this method is to return getLocalAddr() on the
      * wrapped request object.
      *
-     * @since 2.4
+     * @since Servlet 2.4
      */
     @Override
     public String getLocalAddr() {
@@ -340,7 +346,7 @@ public class ServletRequestWrapper imple
      * The default behavior of this method is to return getLocalPort() on the
      * wrapped request object.
      *
-     * @since 2.4
+     * @since Servlet 2.4
      */
     @Override
     public int getLocalPort() {



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