This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new d72f5d9 Minor Javadoc improvements for methods added in Servlet 4.0
d72f5d9 is described below
commit d72f5d9d529f50ab095f109511837dc9aacfd2dd
Author: Mark Thomas <[email protected]>
AuthorDate: Mon Nov 11 17:20:55 2019 +0000
Minor Javadoc improvements for methods added in Servlet 4.0
---
java/javax/servlet/http/HttpServletRequestWrapper.java | 7 +++++--
java/javax/servlet/http/PushBuilder.java | 4 ++--
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/java/javax/servlet/http/HttpServletRequestWrapper.java
b/java/javax/servlet/http/HttpServletRequestWrapper.java
index 4102468..085e9a5 100644
--- a/java/javax/servlet/http/HttpServletRequestWrapper.java
+++ b/java/javax/servlet/http/HttpServletRequestWrapper.java
@@ -116,8 +116,11 @@ public class HttpServletRequestWrapper extends
ServletRequestWrapper implements
}
/**
- * The default behavior of this method is to return getMapping() on the
- * wrapped request object.
+ * The default behavior of this method is to return
+ * {@link HttpServletRequest#getHttpServletMapping()} on the wrapped
request
+ * object.
+ *
+ * @since Servlet 4.0
*/
@Override
public HttpServletMapping getHttpServletMapping() {
diff --git a/java/javax/servlet/http/PushBuilder.java
b/java/javax/servlet/http/PushBuilder.java
index e2a2430..a0f3e67 100644
--- a/java/javax/servlet/http/PushBuilder.java
+++ b/java/javax/servlet/http/PushBuilder.java
@@ -134,8 +134,8 @@ public interface PushBuilder {
* fields are set to {@code null}:
* <ul>
* <li>{@code path}</li>
- * <li>{@code etag}</li>
- * <li>{@code lastModified}</li>
+ * <li>conditional request headers ({@code if-none-match} and
+ * {@code if-modified-since})</li>
* </ul>
*
* @throws IllegalStateException If this method is called when {@code path}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
