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 7691f25 Add new method for WebSocket API
7691f25 is described below
commit 7691f255245d592e7239cfb430708c236b8eae68
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Oct 1 19:53:14 2021 +0100
Add new method for WebSocket API
---
java/jakarta/websocket/server/ServerEndpointConfig.java | 9 +++++++++
webapps/docs/changelog.xml | 10 ++++++++++
2 files changed, 19 insertions(+)
diff --git a/java/jakarta/websocket/server/ServerEndpointConfig.java
b/java/jakarta/websocket/server/ServerEndpointConfig.java
index 1b1a7e7..f327ed3 100644
--- a/java/jakarta/websocket/server/ServerEndpointConfig.java
+++ b/java/jakarta/websocket/server/ServerEndpointConfig.java
@@ -213,6 +213,15 @@ public interface ServerEndpointConfig extends
EndpointConfig {
}
+ /**
+ * Return the platform default configurator.
+ *
+ * @return the platform default configurator
+ */
+ public ServerEndpointConfig.Configurator
getContainerDefaultConfigurator() {
+ return fetchContainerDefaultConfigurator();
+ }
+
public String getNegotiatedSubprotocol(List<String> supported,
List<String> requested) {
return
fetchContainerDefaultConfigurator().getNegotiatedSubprotocol(supported,
requested);
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 47e73b5..464caa4 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -124,6 +124,16 @@
</update>
</changelog>
</subsection>
+ <subsection name="WebSocket">
+ <changelog>
+ <update>
+ Add a new method<code>
+ ServerEndpointConfig.Configurator.getContainerDefaultConfigurator()
+ </code>to align with recent updates in the WebSocket specification
+ project. (markt)
+ </update>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 10.1.0-M6 (markt)" rtext="release in progress">
<subsection name="Catalina">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
