Author: remm
Date: Fri Feb 27 16:04:58 2015
New Revision: 1662734
URL: http://svn.apache.org/r1662734
Log:
Use SocketTimeoutException for the "IO" timeout.
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java?rev=1662734&r1=1662733&r2=1662734&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
Fri Feb 27 16:04:58 2015
@@ -19,6 +19,7 @@ package org.apache.tomcat.websocket;
import java.io.IOException;
import java.io.OutputStream;
import java.io.Writer;
+import java.net.SocketTimeoutException;
import java.nio.ByteBuffer;
import java.nio.CharBuffer;
import java.nio.charset.CharsetEncoder;
@@ -297,8 +298,7 @@ public abstract class WsRemoteEndpointIm
synchronized (messagePartLock) {
try {
if (!messagePartInProgress.tryAcquire(timeout,
TimeUnit.MILLISECONDS)) {
- // TODO i18n
- throw new IOException();
+ throw new SocketTimeoutException();
}
} catch (InterruptedException e) {
// TODO i18n
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
