svn commit: r1445200 - /tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/echo/WsConfigListener.java

[rj...@apache.org]

Author: rjung
Date: Tue Feb 12 15:38:14 2013
New Revision: 1445200

URL: http://svn.apache.org/r1445200
Log:
Base the examples WsConfigListener on the generic
WsListener so it calls general startup and shutdown
code. Otherwise e.g. the websocket timeout thread
is not getting stopped.

Modified:
    tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/echo/WsConfigListener.java

Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/echo/WsConfigListener.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/echo/WsConfigListener.java?rev=1445200&r1=1445199&r2=1445200&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/echo/WsConfigListener.java (original)
+++ tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/echo/WsConfigListener.java Tue Feb 12 15:38:14 2013
@@ -16,23 +16,21 @@
  */
 package websocket.echo;
 
-import javax.servlet.ServletContext;
 import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
 import javax.servlet.annotation.WebListener;
 import javax.websocket.DeploymentException;
 import javax.websocket.server.DefaultServerConfiguration;
 
 import org.apache.tomcat.websocket.server.ServerContainerImpl;
+import org.apache.tomcat.websocket.server.WsListener;
 
 @WebListener
-public class WsConfigListener implements ServletContextListener {
+public class WsConfigListener extends WsListener {
 
     @Override
     public void contextInitialized(ServletContextEvent sce) {
+        super.contextInitialized(sce);
         ServerContainerImpl sc = ServerContainerImpl.getServerContainer();
-        ServletContext servletContext = sce.getServletContext();
-        sc.setServletContext(servletContext);
         try {
             sc.publishServer(EchoEndpoint.class, "/websocket/echoProgrammatic",
                     DefaultServerConfiguration.class);
@@ -44,6 +42,7 @@ public class WsConfigListener implements
 
     @Override
     public void contextDestroyed(ServletContextEvent sce) {
+        super.contextDestroyed(sce);
         // NO-OP
     }
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org