[tomcat] 02/02: Additional fix for BZ 65118

[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

commit ffe30d91cd90c5c02bc15ec8b15cff43f18557f5
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Feb 22 16:32:55 2021 +0000

    Additional fix for BZ 65118
    
    When replacing a closed Stream with a RecycledStream instance, the
    priority hierarchy was not maintained. This led to NPEs during the
    pruning process.
---
 java/org/apache/coyote/http2/AbstractNonZeroStream.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/coyote/http2/AbstractNonZeroStream.java 
b/java/org/apache/coyote/http2/AbstractNonZeroStream.java
index bbdfa33..38761ad 100644
--- a/java/org/apache/coyote/http2/AbstractNonZeroStream.java
+++ b/java/org/apache/coyote/http2/AbstractNonZeroStream.java
@@ -122,7 +122,7 @@ abstract class AbstractNonZeroStream extends AbstractStream 
{
      * level. This is the caller's responsibility.
      */
     void replaceStream(AbstractNonZeroStream replacement) {
-        replacement.setParentStream(getParentStream());
+        getParentStream().addChild(replacement);
         detachFromParent();
         for (AbstractNonZeroStream child : getChildStreams()) {
             replacement.addChild(child);


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