Author: remm
Date: Fri Feb 27 17:34:53 2015
New Revision: 1662759
URL: http://svn.apache.org/r1662759
Log:
Use SocketTimeoutException for the "IO" timeout (other instances).
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java?rev=1662759&r1=1662758&r2=1662759&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
Fri Feb 27 17:34:53 2015
@@ -80,8 +80,7 @@ public class WsRemoteEndpointImplServer
for (ByteBuffer buffer : buffers) {
long timeout = blockingWriteTimeoutExpiry -
System.currentTimeMillis();
if (timeout < 0) {
- // TODO i18n
- SendResult sr = new SendResult(new IOException("Blocking
write timeout"));
+ SendResult sr = new SendResult(new
SocketTimeoutException());
handler.onResult(sr);
return;
}
@@ -92,8 +91,7 @@ public class WsRemoteEndpointImplServer
buffer.position(buffer.limit());
timeout = blockingWriteTimeoutExpiry -
System.currentTimeMillis();
if (timeout < 0) {
- // TODO i18n
- SendResult sr = new SendResult(new
IOException("Blocking write timeout"));
+ SendResult sr = new SendResult(new
SocketTimeoutException());
handler.onResult(sr);
return;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
