Author: markt
Date: Fri Mar 29 21:57:37 2013
New Revision: 1462657
URL: http://svn.apache.org/r1462657
Log:
Make sure closed is set even if flush fails.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WsOutbound.java
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WsOutbound.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WsOutbound.java?rev=1462657&r1=1462656&r2=1462657&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WsOutbound.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WsOutbound.java Fri
Mar 29 21:57:37 2013
@@ -271,9 +271,11 @@ public class WsOutbound {
}
// Send any partial data we have
- doFlush(false);
-
- closed = true;
+ try {
+ doFlush(false);
+ } finally {
+ closed = true;
+ }
upgradeOutbound.write(0x88);
if (status == 0) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
