Author: markt
Date: Mon Nov 27 10:34:22 2017
New Revision: 1816420

URL: http://svn.apache.org/viewvc?rev=1816420&view=rev
Log:
Remove deprecated code.

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=1816420&r1=1816419&r2=1816420&view=diff
==============================================================================
--- tomcat/trunk/java/javax/websocket/WebSocketContainer.java (original)
+++ tomcat/trunk/java/javax/websocket/WebSocketContainer.java Mon Nov 27 
10:34:22 2017
@@ -33,17 +33,6 @@ 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=1816420&r1=1816419&r2=1816420&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java Mon 
Nov 27 10:34:22 2017
@@ -986,18 +986,6 @@ 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: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Reply via email to