[tomcat] branch main updated: Simplify - coyoteResponse can't be null here

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/main by this push:
     new 427c51631b Simplify - coyoteResponse can't be null here
427c51631b is described below

commit 427c51631bfc71219270b15eb93ba6edba3e022c
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Aug 9 19:13:39 2023 +0100

    Simplify - coyoteResponse can't be null here
---
 java/org/apache/catalina/connector/OutputBuffer.java | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/java/org/apache/catalina/connector/OutputBuffer.java 
b/java/org/apache/catalina/connector/OutputBuffer.java
index 8b0a809182..096055bfae 100644
--- a/java/org/apache/catalina/connector/OutputBuffer.java
+++ b/java/org/apache/catalina/connector/OutputBuffer.java
@@ -319,9 +319,6 @@ public class OutputBuffer extends Writer {
         if (closed) {
             return;
         }
-        if (coyoteResponse == null) {
-            return;
-        }
 
         // If we really have something to write
         if (buf.remaining() > 0) {
@@ -546,15 +543,11 @@ public class OutputBuffer extends Writer {
             return;
         }
 
-        Charset charset = null;
-
-        if (coyoteResponse != null) {
-            CharsetHolder charsetHolder = coyoteResponse.getCharsetHolder();
-            // setCharacterEncoding() was called with an invalid character set
-            // Trigger an UnsupportedEncodingException
-            charsetHolder.validate();
-            charset = charsetHolder.getCharset();
-        }
+        CharsetHolder charsetHolder = coyoteResponse.getCharsetHolder();
+        // setCharacterEncoding() was called with an invalid character set
+        // Trigger an UnsupportedEncodingException
+        charsetHolder.validate();
+        Charset charset = charsetHolder.getCharset();
 
         if (charset == null) {
             charset = org.apache.coyote.Constants.DEFAULT_BODY_CHARSET;


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org