[tomcat] 02/03: Add missing facade checks

[markt]

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

commit 2528795d57358f8c00d92bd616803eed3b4be485
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Jan 18 19:29:37 2023 +0000

    Add missing facade checks
---
 .../apache/catalina/connector/ResponseFacade.java   | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/connector/ResponseFacade.java 
b/java/org/apache/catalina/connector/ResponseFacade.java
index ef01dd674f..46b198c63d 100644
--- a/java/org/apache/catalina/connector/ResponseFacade.java
+++ b/java/org/apache/catalina/connector/ResponseFacade.java
@@ -109,7 +109,6 @@ public class ResponseFacade implements HttpServletResponse {
      * @param response The response to be wrapped
      */
     public ResponseFacade(Response response) {
-
          this.response = response;
     }
 
@@ -177,6 +176,7 @@ public class ResponseFacade implements HttpServletResponse {
 
     @Override
     public ServletOutputStream getOutputStream() throws IOException {
+        checkFacade();
         ServletOutputStream sos = response.getOutputStream();
         if (isFinished()) {
             response.setSuspended(true);
@@ -187,6 +187,7 @@ public class ResponseFacade implements HttpServletResponse {
 
     @Override
     public PrintWriter getWriter() throws IOException {
+        checkFacade();
         PrintWriter writer = response.getWriter();
         if (isFinished()) {
             response.setSuspended(true);
@@ -197,6 +198,7 @@ public class ResponseFacade implements HttpServletResponse {
 
     @Override
     public void setContentLength(int len) {
+        checkFacade();
         if (isCommitted()) {
             return;
         }
@@ -206,6 +208,7 @@ public class ResponseFacade implements HttpServletResponse {
 
     @Override
     public void setContentLengthLong(long length) {
+        checkFacade();
         if (isCommitted()) {
             return;
         }
@@ -215,6 +218,7 @@ public class ResponseFacade implements HttpServletResponse {
 
     @Override
     public void setContentType(String type) {
+        checkFacade();
         if (isCommitted()) {
             return;
         }
@@ -243,6 +247,7 @@ public class ResponseFacade implements HttpServletResponse {
 
     @Override
     public void flushBuffer() throws IOException {
+        checkFacade();
         if (isFinished()) {
             return;
         }
@@ -286,6 +291,7 @@ public class ResponseFacade implements HttpServletResponse {
 
     @Override
     public void setLocale(Locale loc) {
+        checkFacade();
         if (isCommitted()) {
             return;
         }
@@ -302,6 +308,7 @@ public class ResponseFacade implements HttpServletResponse {
 
     @Override
     public void addCookie(Cookie cookie) {
+        checkFacade();
         if (isCommitted()) {
             return;
         }
@@ -370,6 +377,7 @@ public class ResponseFacade implements HttpServletResponse {
 
     @Override
     public void setDateHeader(String name, long date) {
+        checkFacade();
         if (isCommitted()) {
             return;
         }
@@ -384,6 +392,7 @@ public class ResponseFacade implements HttpServletResponse {
 
     @Override
     public void addDateHeader(String name, long date) {
+        checkFacade();
         if (isCommitted()) {
             return;
         }
@@ -398,6 +407,7 @@ public class ResponseFacade implements HttpServletResponse {
 
     @Override
     public void setHeader(String name, String value) {
+        checkFacade();
         if (isCommitted()) {
             return;
         }
@@ -407,6 +417,7 @@ public class ResponseFacade implements HttpServletResponse {
 
     @Override
     public void addHeader(String name, String value) {
+        checkFacade();
         if (isCommitted()) {
             return;
         }
@@ -416,6 +427,7 @@ public class ResponseFacade implements HttpServletResponse {
 
     @Override
     public void setIntHeader(String name, int value) {
+        checkFacade();
         if (isCommitted()) {
             return;
         }
@@ -425,6 +437,7 @@ public class ResponseFacade implements HttpServletResponse {
 
     @Override
     public void addIntHeader(String name, int value) {
+        checkFacade();
         if (isCommitted()) {
             return;
         }
@@ -434,6 +447,7 @@ public class ResponseFacade implements HttpServletResponse {
 
     @Override
     public void setStatus(int sc) {
+        checkFacade();
         if (isCommitted()) {
             return;
         }
@@ -467,21 +481,25 @@ 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);
     }
 
@@ -494,6 +512,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-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org