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/01/18 20:17:20 UTC
[tomcat] 02/03: Add missing facade checks
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
commit 7fb42ee701056ae3b6ebc561b5ded5a2bd6f4517
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Jan 18 19:29:37 2023 +0000
Add missing facade checks
---
.../apache/catalina/connector/ResponseFacade.java | 23 +++++++++++++++++++++-
1 file changed, 22 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/connector/ResponseFacade.java b/java/org/apache/catalina/connector/ResponseFacade.java
index 1cc3e34501..8d97f83db4 100644
--- a/java/org/apache/catalina/connector/ResponseFacade.java
+++ b/java/org/apache/catalina/connector/ResponseFacade.java
@@ -110,7 +110,6 @@ public class ResponseFacade implements HttpServletResponse {
* @param response The response to be wrapped
*/
public ResponseFacade(Response response) {
-
this.response = response;
}
@@ -178,6 +177,7 @@ public class ResponseFacade implements HttpServletResponse {
@Override
public ServletOutputStream getOutputStream() throws IOException {
+ checkFacade();
ServletOutputStream sos = response.getOutputStream();
if (isFinished()) {
response.setSuspended(true);
@@ -188,6 +188,7 @@ public class ResponseFacade implements HttpServletResponse {
@Override
public PrintWriter getWriter() throws IOException {
+ checkFacade();
PrintWriter writer = response.getWriter();
if (isFinished()) {
response.setSuspended(true);
@@ -198,6 +199,7 @@ public class ResponseFacade implements HttpServletResponse {
@Override
public void setContentLength(int len) {
+ checkFacade();
if (isCommitted()) {
return;
}
@@ -207,6 +209,7 @@ public class ResponseFacade implements HttpServletResponse {
@Override
public void setContentLengthLong(long length) {
+ checkFacade();
if (isCommitted()) {
return;
}
@@ -216,6 +219,7 @@ public class ResponseFacade implements HttpServletResponse {
@Override
public void setContentType(String type) {
+ checkFacade();
if (isCommitted()) {
return;
}
@@ -244,6 +248,7 @@ public class ResponseFacade implements HttpServletResponse {
@Override
public void flushBuffer() throws IOException {
+ checkFacade();
if (isFinished()) {
return;
}
@@ -287,6 +292,7 @@ public class ResponseFacade implements HttpServletResponse {
@Override
public void setLocale(Locale loc) {
+ checkFacade();
if (isCommitted()) {
return;
}
@@ -303,6 +309,7 @@ public class ResponseFacade implements HttpServletResponse {
@Override
public void addCookie(Cookie cookie) {
+ checkFacade();
if (isCommitted()) {
return;
}
@@ -357,6 +364,7 @@ public class ResponseFacade implements HttpServletResponse {
@Override
public void setDateHeader(String name, long date) {
+ checkFacade();
if (isCommitted()) {
return;
}
@@ -371,6 +379,7 @@ public class ResponseFacade implements HttpServletResponse {
@Override
public void addDateHeader(String name, long date) {
+ checkFacade();
if (isCommitted()) {
return;
}
@@ -385,6 +394,7 @@ public class ResponseFacade implements HttpServletResponse {
@Override
public void setHeader(String name, String value) {
+ checkFacade();
if (isCommitted()) {
return;
}
@@ -394,6 +404,7 @@ public class ResponseFacade implements HttpServletResponse {
@Override
public void addHeader(String name, String value) {
+ checkFacade();
if (isCommitted()) {
return;
}
@@ -403,6 +414,7 @@ public class ResponseFacade implements HttpServletResponse {
@Override
public void setIntHeader(String name, int value) {
+ checkFacade();
if (isCommitted()) {
return;
}
@@ -412,6 +424,7 @@ public class ResponseFacade implements HttpServletResponse {
@Override
public void addIntHeader(String name, int value) {
+ checkFacade();
if (isCommitted()) {
return;
}
@@ -421,6 +434,7 @@ public class ResponseFacade implements HttpServletResponse {
@Override
public void setStatus(int sc) {
+ checkFacade();
if (isCommitted()) {
return;
}
@@ -443,33 +457,39 @@ public class ResponseFacade implements HttpServletResponse {
@Override
public int getStatus() {
+ checkFacade();
return response.getStatus();
}
@Override
public String getHeader(String name) {
+ checkFacade();
return response.getHeader(name);
}
@Override
public Collection<String> getHeaderNames() {
+ checkFacade();
return response.getHeaderNames();
}
@Override
public Collection<String> getHeaders(String name) {
+ checkFacade();
return response.getHeaders(name);
}
@Override
public void setTrailerFields(Supplier<Map<String, String>> supplier) {
+ checkFacade();
response.setTrailerFields(supplier);
}
@Override
public Supplier<Map<String, String>> getTrailerFields() {
+ checkFacade();
return response.getTrailerFields();
}
@@ -482,6 +502,7 @@ public class ResponseFacade implements HttpServletResponse {
private void checkCommitted(String messageKey) {
+ checkFacade();
if (isCommitted()) {
throw new IllegalStateException(sm.getString(messageKey));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org