[tomcat8] 01/01: Removed the setDefaultAsyncSendTimeout method mistakenly added to WebSocketContainer in the version 8.5.24 (Closes: #884046)

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository tomcat8.

commit 0646410b638de1af08f0b03158276388d6e0f3f1
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Dec 14 14:17:13 2017 +0100

    Removed the setDefaultAsyncSendTimeout method mistakenly added to WebSocketContainer in the version 8.5.24 (Closes: #884046)
---
 debian/changelog                                   |  8 +++
 .../patches/0022-websocket-api-compatibility.patch | 61 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 70 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 43f62db..61a4146 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tomcat8 (8.5.24-2) unstable; urgency=medium
+
+  * Team upload.
+  * Removed the setDefaultAsyncSendTimeout method mistakenly added to
+    javax.websocket.WebSocketContainer in the version 8.5.24 (Closes: #884046)
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Thu, 14 Dec 2017 12:35:33 +0100
+
 tomcat8 (8.5.24-1) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/0022-websocket-api-compatibility.patch b/debian/patches/0022-websocket-api-compatibility.patch
new file mode 100644
index 0000000..bfe83c6
--- /dev/null
+++ b/debian/patches/0022-websocket-api-compatibility.patch
@@ -0,0 +1,61 @@
+Description: Removes the new setDefaultAsyncSendTimeout method
+ mistakenly added to WebSocketContainer interface in Tomcat 8.5.24
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: yes
+--- a/java/javax/websocket/WebSocketContainer.java
++++ b/java/javax/websocket/WebSocketContainer.java
+@@ -37,16 +37,8 @@
+      * @deprecated This will be removed in Tomcat 9.
+      *             Use {@link #setDefaultAsyncSendTimeout(long)}
+      */
+-    @Deprecated
+     void setAsyncSendTimeout(long timeout);
+ 
+-    /**
+-     * Set the default timeout for sending a message asynchronously.
+-     * @param timeout The new default timeout in milliseconds. A non-positive
+-     *                value means an infinite timeout.
+-     */
+-    void setDefaultAsyncSendTimeout(long timeout);
+-
+     Session connectToServer(Object endpoint, URI path)
+             throws DeploymentException, IOException;
+ 
+--- a/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
++++ b/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
+@@ -986,7 +986,6 @@
+      * The default value for this implementation is -1.
+      */
+     @Override
+-    @Deprecated
+     public void setAsyncSendTimeout(long timeout) {
+         this.defaultAsyncTimeout = timeout;
+     }
+@@ -997,7 +996,6 @@
+      *
+      * The default value for this implementation is -1.
+      */
+-    @Override
+     public void setDefaultAsyncSendTimeout(long timeout) {
+         this.defaultAsyncTimeout = timeout;
+     }
+--- a/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
++++ b/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
+@@ -325,7 +325,7 @@
+ 
+         // Set the async timeout
+         if (setTimeoutOnContainer) {
+-            wsContainer.setDefaultAsyncSendTimeout(TIMEOUT_MS);
++            wsContainer.setAsyncSendTimeout(TIMEOUT_MS);
+         }
+ 
+         tomcat.start();
+@@ -606,7 +606,7 @@
+                 sc.addEndpoint(ServerEndpointConfig.Builder.create(
+                         ConstantTxEndpoint.class, PATH).build());
+                 if (TestWsWebSocketContainer.timeoutOnContainer) {
+-                    sc.setDefaultAsyncSendTimeout(TIMEOUT_MS);
++                    sc.setAsyncSendTimeout(TIMEOUT_MS);
+                 }
+             } catch (DeploymentException e) {
+                 throw new IllegalStateException(e);
diff --git a/debian/patches/series b/debian/patches/series
index 1b36989..41676a7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@
 0018-fix-manager-webapp.patch
 0019-add-distribution-to-error-page.patch
 0021-dont-test-unsupported-ciphers.patch
+0022-websocket-api-compatibility.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat8.git