--- java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java	(revision 1710467)
+++ java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java	(working copy)
@@ -94,7 +94,7 @@ 
                         open = method;
                     } else {
                         if (currentClazz == clazzPojo ||
-                                (currentClazz != clazzPojo && !isMethodOverride(open, method))) {
+                                !isMethodOverride(open, method)) {
                             // Duplicate annotation
                             throw new DeploymentException(sm.getString(
                                     "pojoMethodMapping.duplicateAnnotation",
@@ -107,7 +107,7 @@ 
                         close = method;
                     } else {
                         if (currentClazz == clazzPojo ||
-                                (currentClazz != clazzPojo && !isMethodOverride(close, method))) {
+                                !isMethodOverride(close, method)) {
                             // Duplicate annotation
                             throw new DeploymentException(sm.getString(
                                     "pojoMethodMapping.duplicateAnnotation",
@@ -120,7 +120,7 @@ 
                         error = method;
                     } else {
                         if (currentClazz == clazzPojo ||
-                                (currentClazz != clazzPojo && !isMethodOverride(error, method))) {
+                                !isMethodOverride(error, method)) {
                             // Duplicate annotation
                             throw new DeploymentException(sm.getString(
                                     "pojoMethodMapping.duplicateAnnotation",
@@ -135,8 +135,7 @@ 
                         if (messageHandler.targetsSameWebSocketMessageType(otherMessageHandler)) {
                             found = true;
                             if (currentClazz == clazzPojo ||
-                                    (currentClazz != clazzPojo
-                                    && !isMethodOverride(messageHandler.m, otherMessageHandler.m))) {
+                                !isMethodOverride(messageHandler.m, otherMessageHandler.m)) {
                                 // Duplicate annotation
                                 throw new DeploymentException(sm.getString(
                                         "pojoMethodMapping.duplicateAnnotation",