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 0a3fd6b162e550477b2e44a4aabbb99c0e677e08 Author: Mark Thomas <[email protected]> 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 d85840d..930f131 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: [email protected] For additional commands, e-mail: [email protected]
