From 6c6fb9c65d98fe50c41fa77f1b2f9eae08b663bf Mon Sep 17 00:00:00 2001
From: Yuta HIGUCHI <y-higuchi@onlab.us>
Date: Fri, 31 Oct 2014 20:21:15 -0700
Subject: [PATCH] deactivate NettyMessagingService

Change-Id: I59a437908570c9acc2776c2b0deedb869cf953e2
---
 .../messaging/impl/ClusterCommunicationManager.java        | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/cluster/messaging/impl/ClusterCommunicationManager.java b/core/store/dist/src/main/java/org/onlab/onos/store/cluster/messaging/impl/ClusterCommunicationManager.java
index 540de77f69..79612c9329 100644
--- a/core/store/dist/src/main/java/org/onlab/onos/store/cluster/messaging/impl/ClusterCommunicationManager.java
+++ b/core/store/dist/src/main/java/org/onlab/onos/store/cluster/messaging/impl/ClusterCommunicationManager.java
@@ -85,7 +85,6 @@ public class ClusterCommunicationManager
         try {
             netty.activate();
         } catch (Exception e) {
-            // TODO Auto-generated catch block
             log.error("NettyMessagingService#activate", e);
         }
         messagingService = netty;
@@ -95,6 +94,12 @@ public class ClusterCommunicationManager
     @Deactivate
     public void deactivate() {
         // TODO: cleanup messageingService if needed.
+        // FIXME: workaround until it becomes a service.
+        try {
+            ((NettyMessagingService) messagingService).deactivate();
+        } catch (Exception e) {
+            log.error("NettyMessagingService#deactivate", e);
+        }
         log.info("Stopped");
     }