You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2023/06/01 20:10:09 UTC
[tomcat] branch 10.1.x updated: Align with 11.0.x
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 8228ead253 Align with 11.0.x
8228ead253 is described below
commit 8228ead25348784a47a974d11f20a96c2038d4d7
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Jun 1 21:09:53 2023 +0100
Align with 11.0.x
---
.../apache/catalina/connector/CoyoteOutputStream.java | 2 ++
java/org/apache/catalina/connector/Response.java | 18 +++++-------------
java/org/apache/catalina/connector/ResponseFacade.java | 5 ++---
3 files changed, 9 insertions(+), 16 deletions(-)
diff --git a/java/org/apache/catalina/connector/CoyoteOutputStream.java b/java/org/apache/catalina/connector/CoyoteOutputStream.java
index a2c570d4cd..4096e4d38d 100644
--- a/java/org/apache/catalina/connector/CoyoteOutputStream.java
+++ b/java/org/apache/catalina/connector/CoyoteOutputStream.java
@@ -18,6 +18,7 @@ package org.apache.catalina.connector;
import java.io.IOException;
import java.nio.ByteBuffer;
+import java.util.Objects;
import jakarta.servlet.ServletOutputStream;
import jakarta.servlet.WriteListener;
@@ -101,6 +102,7 @@ public class CoyoteOutputStream extends ServletOutputStream {
public void write(ByteBuffer from) throws IOException {
+ Objects.requireNonNull(from);
boolean nonBlocking = checkNonBlockingWrite();
ob.write(from);
if (nonBlocking) {
diff --git a/java/org/apache/catalina/connector/Response.java b/java/org/apache/catalina/connector/Response.java
index 3f1c1e8855..29d94efe55 100644
--- a/java/org/apache/catalina/connector/Response.java
+++ b/java/org/apache/catalina/connector/Response.java
@@ -746,10 +746,10 @@ public class Response implements HttpServletResponse {
* Overrides the name of the character encoding used in the body of the request. This method must be called prior to
* reading request parameters or reading input using getReader().
*
- * @param charset String containing the name of the character encoding.
+ * @param encoding String containing the name of the character encoding.
*/
@Override
- public void setCharacterEncoding(String charset) {
+ public void setCharacterEncoding(String encoding) {
if (isCommitted()) {
return;
@@ -767,12 +767,12 @@ public class Response implements HttpServletResponse {
}
try {
- getCoyoteResponse().setCharacterEncoding(charset);
+ getCoyoteResponse().setCharacterEncoding(encoding);
} catch (UnsupportedEncodingException e) {
- log.warn(sm.getString("coyoteResponse.encoding.invalid", charset), e);
+ log.warn(sm.getString("coyoteResponse.encoding.invalid", encoding), e);
return;
}
- if (charset == null) {
+ if (encoding == null) {
isCharacterEncodingSet = false;
} else {
isCharacterEncodingSet = true;
@@ -1213,14 +1213,6 @@ public class Response implements HttpServletResponse {
}
- /**
- * Send a temporary redirect to the specified redirect location URL.
- *
- * @param location Location URL to redirect to
- *
- * @exception IllegalStateException if this response has already been committed
- * @exception IOException if an input/output error occurs
- */
@Override
public void sendRedirect(String location) throws IOException {
sendRedirect(location, SC_FOUND);
diff --git a/java/org/apache/catalina/connector/ResponseFacade.java b/java/org/apache/catalina/connector/ResponseFacade.java
index 1ad8fe9c13..b14ee15e7f 100644
--- a/java/org/apache/catalina/connector/ResponseFacade.java
+++ b/java/org/apache/catalina/connector/ResponseFacade.java
@@ -113,7 +113,6 @@ public class ResponseFacade implements HttpServletResponse {
// ----------------------------------------------- Class/Instance Variables
-
/**
* The string manager for this package.
*/
@@ -447,9 +446,9 @@ public class ResponseFacade implements HttpServletResponse {
@Override
- public void setCharacterEncoding(String arg0) {
+ public void setCharacterEncoding(String encoding) {
checkFacade();
- response.setCharacterEncoding(arg0);
+ response.setCharacterEncoding(encoding);
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org