[jbossweb-commits] JBossWeb SVN: r2422 - branches/7.4.x/src/main/java/org/apache/tomcat/websocket.
Author: remy.maucherat(a)jboss.com
Date: 2014-05-26 18:13:36 -0400 (Mon, 26 May 2014)
New Revision: 2422
Modified:
branches/7.4.x/src/main/java/org/apache/tomcat/websocket/WsRemoteEndpointImplClient.java
Log:
Port Tomcat patch: catch possible ISE on write for clean handling.
Modified:
branches/7.4.x/src/main/java/org/apache/tomcat/websocket/WsRemoteEndpointImplClient.java
===================================================================
---
branches/7.4.x/src/main/java/org/apache/tomcat/websocket/WsRemoteEndpointImplClient.java 2014-05-26
22:11:33 UTC (rev 2421)
+++
branches/7.4.x/src/main/java/org/apache/tomcat/websocket/WsRemoteEndpointImplClient.java 2014-05-26
22:13:36 UTC (rev 2422)
@@ -49,8 +49,12 @@
}
SendHandlerToCompletionHandler sh2ch =
new SendHandlerToCompletionHandler(handler);
- channel.write(data, 0, data.length, timeout, TimeUnit.MILLISECONDS,
- null, sh2ch);
+ try {
+ channel.write(data, 0, data.length, timeout, TimeUnit.MILLISECONDS,
+ null, sh2ch);
+ } catch (IllegalStateException ise) {
+ sh2ch.failed(ise, null);
+ }
}
@Override