commit 51f540f308b76dde317b1773564179514feb148b
author Thomas Vachuska <tom@onlab.us> Wed May 27 17:26:57 2015 -0700
committer Gerrit Code Review <gerrit@onlab.us> Thu May 28 00:33:05 2015 +0000
tree a84a71d3bdb73a5730dfc93ea171685a51181ed7
parent 3650fc4a5b51393cef5cdb3e475f929c0728a315

GUI -- Fixed a shut-down exception by explicitly closing all web-sockets on shutdown.

Change-Id: I3264a9029f36fdba150a3d729a2dd8c9024805d3

web/gui/src/main/java/org/onosproject/ui/impl/UiExtensionManager.java

diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/UiExtensionManager.java b/web/gui/src/main/java/org/onosproject/ui/impl/UiExtensionManager.java
index 0eeda52..5706734 100644
--- a/web/gui/src/main/java/org/onosproject/ui/impl/UiExtensionManager.java
+++ b/web/gui/src/main/java/org/onosproject/ui/impl/UiExtensionManager.java
@@ -23,7 +23,10 @@
 import org.apache.felix.scr.annotations.Activate;
 import org.apache.felix.scr.annotations.Component;
 import org.apache.felix.scr.annotations.Deactivate;
+import org.apache.felix.scr.annotations.Reference;
+import org.apache.felix.scr.annotations.ReferenceCardinality;
 import org.apache.felix.scr.annotations.Service;
+import org.onosproject.mastership.MastershipService;
 import org.onosproject.ui.UiExtension;
 import org.onosproject.ui.UiExtensionService;
 import org.onosproject.ui.UiMessageHandlerFactory;
@@ -66,6 +69,8 @@
     private final AltTopoViewMessageHandler topoHandler =
             new AltTopoViewMessageHandler();
 
+    @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
+    protected MastershipService mastershipService;
 
     // Creates core UI extension
     private UiExtension createCoreExtension() {
@@ -111,6 +116,7 @@
 
     @Deactivate
     public void deactivate() {
+        UiWebSocketServlet.closeAll();
         unregister(core);
         log.info("Stopped");
     }