Author: markt
Date: Mon Dec 11 11:17:44 2017
New Revision: 1817766
URL: http://svn.apache.org/viewvc?rev=1817766&view=rev
Log:
Revert 1816418
Can't change WebSocket API
Modified:
tomcat/trunk/java/javax/websocket/WebSocketContainer.java
tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
Modified: tomcat/trunk/java/javax/websocket/WebSocketContainer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/websocket/WebSocketContainer.java?rev=1817766&r1=1817765&r2=1817766&view=diff
==============================================================================
--- tomcat/trunk/java/javax/websocket/WebSocketContainer.java (original)
+++ tomcat/trunk/java/javax/websocket/WebSocketContainer.java Mon Dec 11
11:17:44 2017
@@ -33,20 +33,9 @@ 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);
-
Session connectToServer(Object endpoint, URI path)
throws DeploymentException, IOException;
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=1817766&r1=1817765&r2=1817766&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:44 2017
@@ -986,22 +986,10 @@ 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;
- }
-
/**
* Cleans up the resources still in use by WebSocket sessions created from
Modified:
tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java?rev=1817766&r1=1817765&r2=1817766&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
(original)
+++ tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
Mon Dec 11 11:17:44 2017
@@ -325,7 +325,7 @@ public class TestWsWebSocketContainer ex
// Set the async timeout
if (setTimeoutOnContainer) {
- wsContainer.setDefaultAsyncSendTimeout(TIMEOUT_MS);
+ wsContainer.setAsyncSendTimeout(TIMEOUT_MS);
}
tomcat.start();
@@ -606,7 +606,7 @@ public class TestWsWebSocketContainer ex
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);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
