svn commit: r1817765 - in /tomcat/trunk/java: javax/websocket/WebSocketContainer.java org/apache/tomcat/websocket/WsWebSocketContainer.java

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r1817765 - in /tomcat/trunk/java: javax/websocket/WebSocketContainer.java org/apache/tomcat/websocket/WsWebSocketContainer.java

markt
Author: markt
Date: Mon Dec 11 11:17:07 2017
New Revision: 1817765

URL: http://svn.apache.org/viewvc?rev=1817765&view=rev
Log:
Revert 1816420
Can't change WebSocket API

Modified:
    tomcat/trunk/java/javax/websocket/WebSocketContainer.java
    tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java

Modified: tomcat/trunk/java/javax/websocket/WebSocketContainer.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/websocket/WebSocketContainer.java?rev=1817765&r1=1817764&r2=1817765&view=diff
==============================================================================
--- tomcat/trunk/java/javax/websocket/WebSocketContainer.java (original)
+++ tomcat/trunk/java/javax/websocket/WebSocketContainer.java Mon Dec 11 11:17:07 2017
@@ -33,6 +33,17 @@ public interface WebSocketContainer {
      * 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.
+     *
+     * @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);
 

Modified: tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java?rev=1817765&r1=1817764&r2=1817765&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java Mon Dec 11 11:17:07 2017
@@ -986,6 +986,18 @@ public class WsWebSocketContainer implem
      * The default value for this implementation is -1.
      */
     @Override
+    @Deprecated
+    public void setAsyncSendTimeout(long timeout) {
+        this.defaultAsyncTimeout = timeout;
+    }
+
+
+    /**
+     * {@inheritDoc}
+     *
+     * The default value for this implementation is -1.
+     */
+    @Override
     public void setDefaultAsyncSendTimeout(long timeout) {
         this.defaultAsyncTimeout = timeout;
     }



---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]