On 27/09/2022 08:40, Han Li wrote:
I don’t know where the changelog entry is placed as 10.0.26 is not released,
so I don’t back-port this change.
After 10.0.26 release, I will go on.
Sorry, I haven't been very good at updating version numbers after
tagging. I've just done 10.0.x. You should be OK to back-port now.
Mark
Han
2022年9月27日 15:30，li...@apache.org 写道：
This is an automated email from the ASF dual-hosted git repository.
lihan 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 1ae46b1555 Fix BZ66276
1ae46b1555 is described below
commit 1ae46b15557067273aad2e2f16873e0c73515435
Author: lihan <li...@apache.org>
AuthorDate: Tue Sep 27 15:29:53 2022 +0800
Fix BZ66276
https://bz.apache.org/bugzilla/show_bug.cgi?id=66276
---
java/org/apache/coyote/http2/AbstractNonZeroStream.java | 4 ++--
webapps/docs/changelog.xml | 8 ++++++++
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/coyote/http2/AbstractNonZeroStream.java
b/java/org/apache/coyote/http2/AbstractNonZeroStream.java
index 0368c4fa6c..f67b17f7d9 100644
--- a/java/org/apache/coyote/http2/AbstractNonZeroStream.java
+++ b/java/org/apache/coyote/http2/AbstractNonZeroStream.java
@@ -75,8 +75,8 @@ abstract class AbstractNonZeroStream extends AbstractStream {
if (isDescendant(parent)) {
parent.detachFromParent();
// Cast is always safe since any descendant of this stream must be
- // an instance of Stream
- getParentStream().addChild((Stream) parent);
+ // an instance of AbstractNonZeroStream
+ getParentStream().addChild((AbstractNonZeroStream) parent);
}
if (exclusive) {
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index e8ea7712b6..85e487007a 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -105,6 +105,14 @@
issues do not "pop up" wrt. others).
-->
<section name="Tomcat 10.1.1 (markt)" rtext="in development">
+ <subsection name="Coyote">
+ <changelog>
+ <fix>
+ <bug>66276</bug>: Fix incorrect class cast when adding
+ a descendant of HTTP/2 streams. (lihan)
+ </fix>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 10.1.0 (markt)" rtext="release in progress">
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
