From da1a6b06d2e2869d83f05307e8ca1ac1d7c32434 Mon Sep 17 00:00:00 2001 From: Madan Jampani Date: Tue, 7 Oct 2014 14:16:15 -0700 Subject: [PATCH] Initialize NettyMessagingService explicitly as it is not a OSGi service yet --- .../messaging/impl/ClusterCommunicationManager.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) 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 babe4d31f6..e4f7e11f5b 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 @@ -30,6 +30,7 @@ import org.onlab.netty.Endpoint; import org.onlab.netty.Message; import org.onlab.netty.MessageHandler; import org.onlab.netty.MessagingService; +import org.onlab.netty.NettyMessagingService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -48,7 +49,6 @@ public class ClusterCommunicationManager public static final long HEART_BEAT_INTERVAL_MILLIS = 1000L; // TODO: This probably should not be a OSGi service. - //@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) private MessagingService messagingService; private static final KryoSerializer SERIALIZER = new KryoSerializer() { @@ -65,11 +65,7 @@ public class ClusterCommunicationManager @Activate public void activate() { - // TODO: initialize messagingService - // TODO: setPayloadSerializer, which is capable of - // (1) serialize ClusterMessage - ClusterMessage.payload - // (2) serialize ClusterMessage.payload using user specified serializer -// messagingService.setPayloadSerializer(...); + messagingService = new NettyMessagingService(localNode.tcpPort()); log.info("Started"); }