This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 0b47fef Non-functional change. Aligning 10.0.x/9.0.x/8.5.x
0b47fef is described below
commit 0b47fefff20e0c3bea4194df5356684f5c031e44
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Mar 25 20:56:22 2021 +0000
Non-functional change. Aligning 10.0.x/9.0.x/8.5.x
---
java/org/apache/catalina/connector/Connector.java | 1 -
java/org/apache/catalina/connector/InputBuffer.java | 1 -
java/org/apache/catalina/connector/Request.java | 4 ++--
java/org/apache/catalina/connector/RequestFacade.java | 16 ++++++----------
java/org/apache/catalina/connector/ResponseFacade.java | 15 +++------------
5 files changed, 11 insertions(+), 26 deletions(-)
diff --git a/java/org/apache/catalina/connector/Connector.java
b/java/org/apache/catalina/connector/Connector.java
index cc42d27..320e1c4 100644
--- a/java/org/apache/catalina/connector/Connector.java
+++ b/java/org/apache/catalina/connector/Connector.java
@@ -106,7 +106,6 @@ public class Connector extends LifecycleMBeanBase {
// ----------------------------------------------------- Instance Variables
-
/**
* The <code>Service</code> we are associated with (if any).
*/
diff --git a/java/org/apache/catalina/connector/InputBuffer.java
b/java/org/apache/catalina/connector/InputBuffer.java
index f2dba3d..1fbc3a9 100644
--- a/java/org/apache/catalina/connector/InputBuffer.java
+++ b/java/org/apache/catalina/connector/InputBuffer.java
@@ -556,7 +556,6 @@ public class InputBuffer extends Reader
}
Charset charset = null;
-
if (coyoteRequest != null) {
charset = coyoteRequest.getCharset();
}
diff --git a/java/org/apache/catalina/connector/Request.java
b/java/org/apache/catalina/connector/Request.java
index 3ffaabf..aa237b7 100644
--- a/java/org/apache/catalina/connector/Request.java
+++ b/java/org/apache/catalina/connector/Request.java
@@ -1855,8 +1855,8 @@ public class Request implements HttpServletRequest {
}
Cookie[] newCookies = new Cookie[size + 1];
- for (int i = 0; i < size; i++) {
- newCookies[i] = cookies[i];
+ if (cookies != null) {
+ System.arraycopy(cookies, 0, newCookies, 0, size);
}
newCookies[size] = cookie;
diff --git a/java/org/apache/catalina/connector/RequestFacade.java
b/java/org/apache/catalina/connector/RequestFacade.java
index e80147c..e524173 100644
--- a/java/org/apache/catalina/connector/RequestFacade.java
+++ b/java/org/apache/catalina/connector/RequestFacade.java
@@ -1056,11 +1056,13 @@ public class RequestFacade implements
HttpServletRequest {
return request.getAsyncContext();
}
+
@Override
public DispatcherType getDispatcherType() {
return request.getDispatcherType();
}
+
@Override
public boolean authenticate(HttpServletResponse response)
throws IOException, ServletException {
@@ -1084,31 +1086,25 @@ public class RequestFacade implements
HttpServletRequest {
return request.getParts();
}
+
@Override
public Part getPart(String name) throws IllegalStateException, IOException,
ServletException {
return request.getPart(name);
}
+
public boolean getAllowTrace() {
return request.getConnector().getAllowTrace();
}
- /**
- * {@inheritDoc}
- *
- * @since Servlet 3.1
- */
+
@Override
public long getContentLengthLong() {
return request.getContentLengthLong();
}
- /**
- * {@inheritDoc}
- *
- * @since Servlet 3.1
- */
+
@Override
public <T extends HttpUpgradeHandler> T upgrade(
Class<T> httpUpgradeHandlerClass) throws java.io.IOException,
ServletException {
diff --git a/java/org/apache/catalina/connector/ResponseFacade.java
b/java/org/apache/catalina/connector/ResponseFacade.java
index 460c74f..252b990 100644
--- a/java/org/apache/catalina/connector/ResponseFacade.java
+++ b/java/org/apache/catalina/connector/ResponseFacade.java
@@ -40,9 +40,7 @@ import org.apache.tomcat.util.res.StringManager;
* @author Remy Maucherat
*/
@SuppressWarnings("deprecation")
-public class ResponseFacade
- implements HttpServletResponse {
-
+public class ResponseFacade implements HttpServletResponse {
// ----------------------------------------------------------- DoPrivileged
@@ -86,8 +84,8 @@ public class ResponseFacade
}
}
- // ----------------------------------------------------------- Constructors
+ // ----------------------------------------------------------- Constructors
/**
* Construct a wrapper for the specified response.
@@ -219,11 +217,9 @@ public class ResponseFacade
@Override
public void setContentLength(int len) {
-
if (isCommitted()) {
return;
}
-
response.setContentLength(len);
}
@@ -278,12 +274,9 @@ public class ResponseFacade
@Override
- public void flushBuffer()
- throws IOException {
+ public void flushBuffer() throws IOException {
if (isFinished()) {
- // throw new IllegalStateException
- // (/*sm.getString("responseFacade.finished")*/);
return;
}
@@ -308,10 +301,8 @@ public class ResponseFacade
}
} else {
response.setAppCommitted(true);
-
response.flushBuffer();
}
-
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
