Author: markt
Date: Mon Dec  8 20:38:48 2014
New Revision: 1643908

URL: http://svn.apache.org/r1643908
Log:
Rename method since equals() has a specific meaning that doesn't seem the right 
fit for this use case. This also stops the IDE complaining that hashCode() 
needs to be overridden because equals has been.

Modified:
    tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java

Modified: 
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java?rev=1643908&r1=1643907&r2=1643908&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java 
Mon Dec  8 20:38:48 2014
@@ -132,7 +132,7 @@ public class PojoMethodMapping {
                     MessageHandlerInfo messageHandler = new 
MessageHandlerInfo(method, decoders);
                     boolean found = false;
                     for (MessageHandlerInfo otherMessageHandler : onMessage) {
-                        if (messageHandler.equals(otherMessageHandler)) {
+                        if 
(messageHandler.targetsSameWebSocketMessageType(otherMessageHandler)) {
                             found = true;
                             if (currentClazz == clazzPojo ||
                                     (currentClazz != clazzPojo
@@ -589,12 +589,10 @@ public class PojoMethodMapping {
         }
 
 
-        @Override
-        public boolean equals(Object obj) {
-            if (obj == null || !(obj instanceof MessageHandlerInfo)) {
+        public boolean targetsSameWebSocketMessageType(MessageHandlerInfo 
otherHandler) {
+            if (otherHandler == null) {
                 return false;
             }
-            MessageHandlerInfo otherHandler = (MessageHandlerInfo) obj;
             if (indexByteArray >= 0 && otherHandler.indexByteArray >= 0) {
                 return true;
             }



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

Reply via email to