@@ -, +, @@ 
---
 java/org/apache/tomcat/websocket/WsSession.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--- a/java/org/apache/tomcat/websocket/WsSession.java	
+++ a/java/org/apache/tomcat/websocket/WsSession.java	
@@ -315,13 +315,13 @@ public class WsSession implements Session {
             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;
--