commit 91768e30e58d3d3357856ae796bbff25f73c6086
author Yuta HIGUCHI <y-higuchi@onlab.us> Sat Nov 22 05:06:35 2014 -0800
committer Gerrit Code Review <gerrit@onlab.us> Sat Nov 22 19:35:28 2014 -0800
tree f16ae0e8ff5752337c1f502fbb719c0ec97b6a6f
parent 7b403bc101970353284eabd699dee11027b6c29a

Kryo related fixes

- KryoNamespace to allow control over registration id

Change-Id: Idc2a0e27a09916657c725ee97e4366109144cc66

core/store/dist/src/main/java/org/onlab/onos/store/service/impl/DatabaseManager.java

diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/service/impl/DatabaseManager.java b/core/store/dist/src/main/java/org/onlab/onos/store/service/impl/DatabaseManager.java
index 2c0ff14..c3494d9 100644
--- a/core/store/dist/src/main/java/org/onlab/onos/store/service/impl/DatabaseManager.java
+++ b/core/store/dist/src/main/java/org/onlab/onos/store/service/impl/DatabaseManager.java
@@ -173,7 +173,7 @@
             DatabaseStateMachine stateMachine = new DatabaseStateMachine();
             stateMachine.addEventListener(expirationTracker);
             Log consensusLog = new MapDBLog(LOG_FILE_PREFIX + localNode.id(),
-                    ClusterMessagingProtocol.SERIALIZER);
+                    ClusterMessagingProtocol.DB_SERIALIZER);
 
             copycat = new Copycat(stateMachine, consensusLog, cluster, copycatMessagingProtocol);
             copycat.event(LeaderElectEvent.class).registerHandler(new RaftLeaderElectionMonitor());
@@ -432,7 +432,7 @@
                             new ClusterMessage(
                                     clusterService.getLocalNode().id(),
                                     RAFT_LEADER_ELECTION_EVENT,
-                                    ClusterMessagingProtocol.SERIALIZER.encode(event)));
+                                    ClusterMessagingProtocol.DB_SERIALIZER.encode(event)));
                 }
             } catch (Exception e) {
                 log.debug("LeaderAdvertiser failed with exception", e);
@@ -454,7 +454,7 @@
                             new ClusterMessage(
                                     clusterService.getLocalNode().id(),
                                     RAFT_LEADER_ELECTION_EVENT,
-                                    ClusterMessagingProtocol.SERIALIZER.encode(event)));
+                                    ClusterMessagingProtocol.DB_SERIALIZER.encode(event)));
                 } else {
                     if (myLeaderEvent != null) {
                         log.debug("This node is no longer the Leader");