svn commit: r1799214 - /tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsSession.java

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

svn commit: r1799214 - /tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsSession.java

Mark Thomas-2
Author: markt
Date: Mon Jun 19 14:37:45 2017
New Revision: 1799214

URL: http://svn.apache.org/viewvc?rev=1799214&view=rev
Log:
Correct back-port of fix for BZ 61183

Modified:
    tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsSession.java

Modified: tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsSession.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsSession.java?rev=1799214&r1=1799213&r2=1799214&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsSession.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsSession.java Mon Jun 19 14:37:45 2017
@@ -667,7 +667,7 @@ public class WsSession implements Sessio
         // Always register the future.
         futures.put(f2sh, f2sh);
 
-        if (state == State.OPEN) {
+        if (state == State.OPEN || f2sh.isCloseMessage()) {
             // The session is open. The future has been registered with the open
             // session. Normal processing continues.
             return;



---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Loading...