svn commit: r1702246 - /tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java

[markt]

Author: markt
Date: Thu Sep 10 13:35:36 2015
New Revision: 1702246

URL: http://svn.apache.org/r1702246
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58342
Fix copy paste error that meant MessageHandler removal could fail for binary 
and pong MessageHandlers.
Patch provided by DJ.

Modified:
    tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java

Modified: tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java?rev=1702246&r1=1702245&r2=1702246&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java Thu Sep 10 
13:35:36 2015
@@ -315,13 +315,13 @@ public class WsSession implements Sessio
             removed = true;
         }
 
-        if (listener.equals(binaryMessageHandler) ||
+        if (wrapped.equals(binaryMessageHandler) ||
                 listener.equals(binaryMessageHandler)) {
             binaryMessageHandler = null;
             removed = true;
         }
 
-        if (listener.equals(pongMessageHandler) ||
+        if (wrapped.equals(pongMessageHandler) ||
                 listener.equals(pongMessageHandler)) {
             pongMessageHandler = null;
             removed = true;



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org