You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2021/08/03 09:18:45 UTC
[tomcat] branch main updated: Fix regression that broke websocket.
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 0f8a19d Fix regression that broke websocket.
0f8a19d is described below
commit 0f8a19d16d7bb327b54195df6511291b294579fd
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Aug 3 11:18:23 2021 +0200
Fix regression that broke websocket.
Missing "!" in commit 46cb8c3b
---
java/org/apache/tomcat/websocket/server/WsSci.java | 2 +-
webapps/docs/changelog.xml | 8 ++++++++
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/websocket/server/WsSci.java b/java/org/apache/tomcat/websocket/server/WsSci.java
index 9e7e063..b278086 100644
--- a/java/org/apache/tomcat/websocket/server/WsSci.java
+++ b/java/org/apache/tomcat/websocket/server/WsSci.java
@@ -64,7 +64,7 @@ public class WsSci implements ServletContainerInitializer {
if (!Modifier.isPublic(modifiers) ||
Modifier.isAbstract(modifiers) ||
Modifier.isInterface(modifiers) ||
- isExported(clazz)) {
+ !isExported(clazz)) {
// Non-public, abstract, interface or not in an exported
// package - skip it.
continue;
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index d435739..d462487 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.0-M4 (markt)" rtext="in development">
+ <subsection name="WebSocket">
+ <changelog>
+ <fix>
+ Correct a regression in the Java 8 to Java 11 changes made in 10.1.0-M3
+ that caused all WebSocket end points to fail to register. (markt)
+ </fix>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 10.1.0-M3 (markt)" rtext="release in progress">
<subsection name="General">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org