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/ClusterMessagingProtocolClient.java

diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/service/impl/ClusterMessagingProtocolClient.java b/core/store/dist/src/main/java/org/onlab/onos/store/service/impl/ClusterMessagingProtocolClient.java
index 9bba4b5..475db82 100644
--- a/core/store/dist/src/main/java/org/onlab/onos/store/service/impl/ClusterMessagingProtocolClient.java
+++ b/core/store/dist/src/main/java/org/onlab/onos/store/service/impl/ClusterMessagingProtocolClient.java
@@ -1,7 +1,7 @@
 package org.onlab.onos.store.service.impl;
 
 import static com.google.common.base.Verify.verifyNotNull;
-import static org.onlab.onos.store.service.impl.ClusterMessagingProtocol.SERIALIZER;
+import static org.onlab.onos.store.service.impl.ClusterMessagingProtocol.DB_SERIALIZER;
 import static org.onlab.util.Tools.namedThreads;
 import static org.slf4j.LoggerFactory.getLogger;
 
@@ -139,7 +139,7 @@
                     new ClusterMessage(
                             localNode.id(),
                             messageType(request),
-                            verifyNotNull(SERIALIZER.encode(request)));
+                            verifyNotNull(DB_SERIALIZER.encode(request)));
             this.future = future;
         }
 
@@ -158,7 +158,8 @@
                 if (!connectionOK.getAndSet(true)) {
                     log.info("Connectivity to {} restored", remoteNode);
                 }
-                future.complete(verifyNotNull(SERIALIZER.decode(response)));
+                future.complete(verifyNotNull(DB_SERIALIZER.decode(response)));
+
             } catch (IOException | TimeoutException e) {
                 if (connectionOK.getAndSet(false)) {
                     log.warn("Detected connectivity issues with {}. Reason: {}", remoteNode, e.getMessage());