[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 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 5d4071b229830d1dbcfea2ae727e73cbadd34e10
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 9b9e00af08..1ae9ee6805 100644
--- a/java/org/apache/catalina/connector/ResponseFacade.java
+++ b/java/org/apache/catalina/connector/ResponseFacade.java
@@ -111,7 +111,6 @@ public class ResponseFacade implements HttpServletResponse {
      * @param response The response to be wrapped
      */
     public ResponseFacade(Response response) {
-
          this.response = response;
     }
 
@@ -179,6 +178,7 @@ public class ResponseFacade implements HttpServletResponse {
 
     @Override
     public ServletOutputStream getOutputStream() throws IOException {
+        checkFacade();
         ServletOutputStream sos = response.getOutputStream();
         if (isFinished()) {
             response.setSuspended(true);
@@ -189,6 +189,7 @@ public class ResponseFacade implements HttpServletResponse {
 
     @Override
     public PrintWriter getWriter() throws IOException {
+        checkFacade();
         PrintWriter writer = response.getWriter();
         if (isFinished()) {
             response.setSuspended(true);
@@ -199,6 +200,7 @@ public class ResponseFacade implements HttpServletResponse {
 
     @Override
     public void setContentLength(int len) {
+        checkFacade();
         if (isCommitted()) {
             return;
         }
@@ -208,6 +210,7 @@ public class ResponseFacade implements HttpServletResponse {
 
     @Override
     public void setContentLengthLong(long length) {
+        checkFacade();
         if (isCommitted()) {
             return;
         }
@@ -217,6 +220,7 @@ public class ResponseFacade implements HttpServletResponse {
 
     @Override
     public void setContentType(String type) {
+        checkFacade();
         if (isCommitted()) {
             return;
         }
@@ -245,6 +249,7 @@ public class ResponseFacade implements HttpServletResponse {
 
     @Override
     public void flushBuffer() throws IOException {
+        checkFacade();
         if (isFinished()) {
             return;
         }
@@ -288,6 +293,7 @@ public class ResponseFacade implements HttpServletResponse {
 
     @Override
     public void setLocale(Locale loc) {
+        checkFacade();
         if (isCommitted()) {
             return;
         }
@@ -304,6 +310,7 @@ public class ResponseFacade implements HttpServletResponse {
 
     @Override
     public void addCookie(Cookie cookie) {
+        checkFacade();
         if (isCommitted()) {
             return;
         }
@@ -372,6 +379,7 @@ public class ResponseFacade implements HttpServletResponse {
 
     @Override
     public void setDateHeader(String name, long date) {
+        checkFacade();
         if (isCommitted()) {
             return;
         }
@@ -386,6 +394,7 @@ public class ResponseFacade implements HttpServletResponse {
 
     @Override
     public void addDateHeader(String name, long date) {
+        checkFacade();
         if (isCommitted()) {
             return;
         }
@@ -400,6 +409,7 @@ public class ResponseFacade implements HttpServletResponse {
 
     @Override
     public void setHeader(String name, String value) {
+        checkFacade();
         if (isCommitted()) {
             return;
         }
@@ -409,6 +419,7 @@ public class ResponseFacade implements HttpServletResponse {
 
     @Override
     public void addHeader(String name, String value) {
+        checkFacade();
         if (isCommitted()) {
             return;
         }
@@ -418,6 +429,7 @@ public class ResponseFacade implements HttpServletResponse {
 
     @Override
     public void setIntHeader(String name, int value) {
+        checkFacade();
         if (isCommitted()) {
             return;
         }
@@ -427,6 +439,7 @@ public class ResponseFacade implements HttpServletResponse {
 
     @Override
     public void addIntHeader(String name, int value) {
+        checkFacade();
         if (isCommitted()) {
             return;
         }
@@ -436,6 +449,7 @@ public class ResponseFacade implements HttpServletResponse {
 
     @Override
     public void setStatus(int sc) {
+        checkFacade();
         if (isCommitted()) {
             return;
         }
@@ -469,33 +483,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();
     }
 
@@ -508,6 +528,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