Author: markt
Date: Thu Jun 27 11:30:22 2013
New Revision: 1497305
URL: http://svn.apache.org/r1497305
Log:
WebSocket 1.0, Section 5.2.2
Container must log error if no error handling is configured.
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/LocalStrings.properties
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoEndpointBase.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=1497305&r1=1497304&r2=1497305&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/pojo/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/pojo/LocalStrings.properties
Thu Jun 27 11:30:22 2013
@@ -15,6 +15,7 @@
pojoEndpointBase.closeSessionFail=Failed to close WebSocket session during
error handling
pojoEndpointBase.onCloseFail=Failed to call onClose method of POJO end point
for POJO of type [{0}]
+pojoEndpointBase.onError=No error handling configured for [{0}] and the
following error occurred
pojoEndpointBase.onErrorFail=Failed to call onError method of POJO end point
for POJO of type [{0}]
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}]
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoEndpointBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoEndpointBase.java?rev=1497305&r1=1497304&r2=1497305&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoEndpointBase.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoEndpointBase.java
Thu Jun 27 11:30:22 2013
@@ -123,7 +123,10 @@ public abstract class PojoEndpointBase e
@Override
public final void onError(Session session, Throwable throwable) {
- if (methodMapping.getOnError() != null) {
+ if (methodMapping.getOnError() == null) {
+ log.error(sm.getString("pojoEndpointBase.onError",
+ pojo.getClass().getName()), throwable);
+ } else {
try {
methodMapping.getOnError().invoke(
pojo,
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
