Author: markt
Date: Tue Jun 25 13:00:42 2013
New Revision: 1496454
URL: http://svn.apache.org/r1496454
Log:
WebSocket 1.0. Section 4.1.[4-6]
Duplicate on[Open|Close|Error] annotations should trigger a deployment failure
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/LocalStrings.properties
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/pojo/LocalStrings.properties?rev=1496454&r1=1496453&r2=1496454&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/pojo/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/pojo/LocalStrings.properties
Tue Jun 25 13:00:42 2013
@@ -19,6 +19,7 @@ pojoEndpointBase.onErrorFail=Failed to c
pojoEndpointBase.onOpenFail=Failed to call onOpen method of POJO end point for
POJO of type [{0}]
pojoEndpointServer.getPojoInstanceFail=Failed to create instance of POJO of
type [{0}]
pojoMethodMapping.decodePathParamFail=Failed to decode path parameter value
[{0}] to expected type [{1}]
+pojoMethodMapping.duplicateAnnotation=Duplicate annotations present on class
[{0}]
pojoMethodMapping.duplicateLastParam=Multiple boolean (last) parameters
present on the method [{0}] of class [{1}] that was annotated with OnMessage
pojoMethodMapping.duplicateMessageParam=Multiple message parameters present on
the method [{0}] of class [{1}] that was annotated with OnMessage
pojoMethodMapping.duplicatePongMessageParam=Multiple PongMessage parameters
present on the method [{0}] of class [{1}] that was annotated with OnMessage
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=1496454&r1=1496453&r2=1496454&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java
Tue Jun 25 13:00:42 2013
@@ -90,6 +90,10 @@ public class PojoMethodMapping {
error = method;
} else if (method.getAnnotation(OnMessage.class) != null) {
onMessage.add(new MessageMethod(method, decoders));
+ } else {
+ // Duplicate annotation
+ throw new DeploymentException(sm.getString(
+ "pojoMethodMapping.duplicateAnnotation", clazzPojo));
}
}
this.onOpen = open;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
