Author: markt
Date: Tue Mar 26 21:19:51 2013
New Revision: 1461318
URL: http://svn.apache.org/r1461318
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54755
Endpoint instantiation should be via Configurator
Patch provided by rstoyanchev
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServlet.java
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServlet.java?rev=1461318&r1=1461317&r2=1461318&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServlet.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServlet.java Tue Mar
26 21:19:51 2013
@@ -135,11 +135,12 @@ public class WsServlet extends HttpServl
try {
Class<?> clazz = sec.getEndpointClass();
if (Endpoint.class.isAssignableFrom(clazz)) {
- ep = (Endpoint) sec.getEndpointClass().newInstance();
+ ep = (Endpoint) sec.getConfigurator().getEndpointInstance(
+ sec.getEndpointClass());
} else {
ep = new PojoEndpointServer();
}
- } catch (InstantiationException | IllegalAccessException e) {
+ } catch (InstantiationException e) {
throw new ServletException(e);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
