View | Details | Raw Unified | Return to bug 58534
Collapse All | Expand All

(-)java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java (-5 / +4 lines)
Lines 94-100 Link Here
94
                        open = method;
94
                        open = method;
95
                    } else {
95
                    } else {
96
                        if (currentClazz == clazzPojo ||
96
                        if (currentClazz == clazzPojo ||
97
                                (currentClazz != clazzPojo && !isMethodOverride(open, method))) {
97
                                !isMethodOverride(open, method)) {
98
                            // Duplicate annotation
98
                            // Duplicate annotation
99
                            throw new DeploymentException(sm.getString(
99
                            throw new DeploymentException(sm.getString(
100
                                    "pojoMethodMapping.duplicateAnnotation",
100
                                    "pojoMethodMapping.duplicateAnnotation",
Lines 107-113 Link Here
107
                        close = method;
107
                        close = method;
108
                    } else {
108
                    } else {
109
                        if (currentClazz == clazzPojo ||
109
                        if (currentClazz == clazzPojo ||
110
                                (currentClazz != clazzPojo && !isMethodOverride(close, method))) {
110
                                !isMethodOverride(close, method)) {
111
                            // Duplicate annotation
111
                            // Duplicate annotation
112
                            throw new DeploymentException(sm.getString(
112
                            throw new DeploymentException(sm.getString(
113
                                    "pojoMethodMapping.duplicateAnnotation",
113
                                    "pojoMethodMapping.duplicateAnnotation",
Lines 120-126 Link Here
120
                        error = method;
120
                        error = method;
121
                    } else {
121
                    } else {
122
                        if (currentClazz == clazzPojo ||
122
                        if (currentClazz == clazzPojo ||
123
                                (currentClazz != clazzPojo && !isMethodOverride(error, method))) {
123
                                !isMethodOverride(error, method)) {
124
                            // Duplicate annotation
124
                            // Duplicate annotation
125
                            throw new DeploymentException(sm.getString(
125
                            throw new DeploymentException(sm.getString(
126
                                    "pojoMethodMapping.duplicateAnnotation",
126
                                    "pojoMethodMapping.duplicateAnnotation",
Lines 135-142 Link Here
135
                        if (messageHandler.targetsSameWebSocketMessageType(otherMessageHandler)) {
135
                        if (messageHandler.targetsSameWebSocketMessageType(otherMessageHandler)) {
136
                            found = true;
136
                            found = true;
137
                            if (currentClazz == clazzPojo ||
137
                            if (currentClazz == clazzPojo ||
138
                                    (currentClazz != clazzPojo
138
                                !isMethodOverride(messageHandler.m, otherMessageHandler.m)) {
139
                                    && !isMethodOverride(messageHandler.m, otherMessageHandler.m))) {
140
                                // Duplicate annotation
139
                                // Duplicate annotation
141
                                throw new DeploymentException(sm.getString(
140
                                throw new DeploymentException(sm.getString(
142
                                        "pojoMethodMapping.duplicateAnnotation",
141
                                        "pojoMethodMapping.duplicateAnnotation",

Return to bug 58534