[tomcat] branch master updated: Revert stream memory footprint reduction and incomplete fixes

[markt]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new ad6c5db  Revert stream memory footprint reduction and incomplete fixes
ad6c5db is described below

commit ad6c5db660f644751c6cded22d0f94b7ad193541
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Sep 8 10:16:57 2020 +0100

    Revert stream memory footprint reduction and incomplete fixes
    
    Revert the changes due to the steady stream of regressions that are
    being reported and.or found by the CI systems. A more robust solution is
    required.
---
 java/org/apache/coyote/http2/Stream.java | 41 ++++++++++++--------------------
 webapps/docs/changelog.xml               |  5 ++++
 2 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/java/org/apache/coyote/http2/Stream.java 
b/java/org/apache/coyote/http2/Stream.java
index ea87346..5089456 100644
--- a/java/org/apache/coyote/http2/Stream.java
+++ b/java/org/apache/coyote/http2/Stream.java
@@ -300,19 +300,14 @@ class Stream extends AbstractStream implements 
HeaderEmitter {
 
 
     void doStreamCancel(String msg, Http2Error error) throws CloseNowException 
{
-        // Avoid NPEs on duplicate cancellations
-        StreamOutputBuffer streamOutputBuffer = this.streamOutputBuffer;
-        Response coyoteResponse = this.coyoteResponse;
         StreamException se = new StreamException(msg, error, getIdAsInt());
-        if (streamOutputBuffer != null && coyoteResponse != null) {
-            // Prevent the application making further writes
-            streamOutputBuffer.closed = true;
-            // Prevent Tomcat's error handling trying to write
-            coyoteResponse.setError();
-            coyoteResponse.setErrorReported();
-            // Trigger a reset once control returns to Tomcat
-            streamOutputBuffer.reset = se;
-        }
+        // Prevent the application making further writes
+        streamOutputBuffer.closed = true;
+        // Prevent Tomcat's error handling trying to write
+        coyoteResponse.setError();
+        coyoteResponse.setErrorReported();
+        // Trigger a reset once control returns to Tomcat
+        streamOutputBuffer.reset = se;
         throw new CloseNowException(msg, se);
     }
 
@@ -475,12 +470,8 @@ class Stream extends AbstractStream implements 
HeaderEmitter {
             }
 
             if (headerState == HEADER_STATE_TRAILER) {
-                // Avoid NPE if Stream has been closed on Stream specific 
thread
-                Request coyoteRequest = this.coyoteRequest;
-                if (coyoteRequest != null) {
-                    // HTTP/2 headers are already always lower case
-                    coyoteRequest.getTrailerFields().put(name, value);
-                }
+                // HTTP/2 headers are already always lower case
+                coyoteRequest.getTrailerFields().put(name, value);
             } else {
                 coyoteRequest.getMimeHeaders().addValue(name).setString(value);
             }
@@ -656,14 +647,9 @@ class Stream extends AbstractStream implements 
HeaderEmitter {
 
 
     final boolean isContentLengthInconsistent() {
-        Request coyoteRequest = this.coyoteRequest;
-        // May be null when processing trailer headers after stream has been
-        // closed.
-        if (coyoteRequest != null) {
-            long contentLengthHeader = coyoteRequest.getContentLengthLong();
-            if (contentLengthHeader > -1 && contentLengthReceived != 
contentLengthHeader) {
-                return true;
-            }
+        long contentLengthHeader = coyoteRequest.getContentLengthLong();
+        if (contentLengthHeader > -1 && contentLengthReceived != 
contentLengthHeader) {
+            return true;
         }
         return false;
     }
@@ -765,12 +751,15 @@ class Stream extends AbstractStream implements 
HeaderEmitter {
         if (log.isDebugEnabled()) {
             log.debug(sm.getString("stream.recycle", getConnectionId(), 
getIdentifier()));
         }
+        /*
+         * Temporarily disabled due to multiple regressions (NPEs)
         coyoteRequest = null;
         cookieHeader = null;
         coyoteResponse = null;
         inputBuffer = null;
         streamOutputBuffer = null;
         http2OutputBuffer = null;
+        */
     }
 
 
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index ad9e1d2..f55163a 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -176,6 +176,11 @@
         streams to account for DATA frames containing zero-length padding.
         (markt)
       </fix>
+      <fix>
+        <bug>64710</bug>: Revert the changes to reduce the memory footprint of
+        closed HTTP/2 streams as they triggered multiple regressions in the 
form
+        of <code>NullPointerException</code>s. (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="WebSocket">


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