[jbossweb-commits] JBossWeb SVN: r2274 - branches/7.4.x/src/main/java/org/apache/tomcat/websocket.
jbossweb-commits at lists.jboss.org
jbossweb-commits at lists.jboss.org
Thu Oct 3 10:00:02 EDT 2013
Author: remy.maucherat at jboss.com
Date: 2013-10-03 10:00:02 -0400 (Thu, 03 Oct 2013)
New Revision: 2274
Modified:
branches/7.4.x/src/main/java/org/apache/tomcat/websocket/WsFrameClient.java
Log:
Port WS patch.
Modified: branches/7.4.x/src/main/java/org/apache/tomcat/websocket/WsFrameClient.java
===================================================================
--- branches/7.4.x/src/main/java/org/apache/tomcat/websocket/WsFrameClient.java 2013-10-02 11:19:56 UTC (rev 2273)
+++ branches/7.4.x/src/main/java/org/apache/tomcat/websocket/WsFrameClient.java 2013-10-03 14:00:02 UTC (rev 2274)
@@ -102,7 +102,14 @@
try {
processSocketRead();
} catch (IOException e) {
- close(e);
+ // Only send a close message on an IOException if the client
+ // has not yet received a close control message from the server
+ // as the IOException may be in response to the client
+ // continuing to send a message after the server sent a close
+ // control message.
+ if (isOpen()) {
+ close(e);
+ }
}
}
More information about the jbossweb-commits
mailing list