--- android/TrainInfoService/src/dk/thoerup/traininfoservice/CircuitBreakerListener.java	2010/02/05 13:57:39	584
+++ android/TrainInfoService/src/dk/thoerup/traininfoservice/CircuitBreakerListener.java	2010/07/05 09:49:53	959
@@ -4,6 +4,7 @@
 
 import javax.servlet.ServletContextEvent;
 import javax.servlet.ServletContextListener;
+import javax.servlet.annotation.WebListener;
 
 import dk.thoerup.circuitbreaker.AccountingCircuitBreaker;
 import dk.thoerup.circuitbreaker.CircuitBreakerManager;
@@ -14,6 +15,7 @@
  * Application Lifecycle Listener implementation class JmxListener
  *
  */
+@WebListener
 public class CircuitBreakerListener implements ServletContextListener {
 
 	Logger logger = Logger.getLogger(CircuitBreakerListener.class.getName());
@@ -43,6 +45,8 @@
      */
     public void contextDestroyed(ServletContextEvent sce) {
     	logger.warning("Context Destroyed");
+		CircuitBreakerManager.getManager().removeCircuitBreaker("banedk");
+
     	JMXWrapper.unregisterAllCircuitBreakers();
     }