commit 10666e5a311b02627342d0e8c907716c6fd5b741
author Madan Jampani <madan.jampani@gmail.com> Thu Feb 11 16:46:42 2016 -0800
committer Gerrit Code Review <gerrit@onlab.us> Fri Feb 12 01:06:45 2016 +0000
tree f1ed1aad4af73201c25a8f1bc494d6ff8cb20e28
parent 57efbb25e752dc518105f9cb77f0bc66d198a190

Fix registration order in kryo

Change-Id: I051124ecb7bb55276c253af18f0c47df4a68c875

core/store/serializers/src/main/java/org/onosproject/store/serializers/KryoNamespaces.java

diff --git a/core/store/serializers/src/main/java/org/onosproject/store/serializers/KryoNamespaces.java b/core/store/serializers/src/main/java/org/onosproject/store/serializers/KryoNamespaces.java
index ea37c43..17480bc 100644
--- a/core/store/serializers/src/main/java/org/onosproject/store/serializers/KryoNamespaces.java
+++ b/core/store/serializers/src/main/java/org/onosproject/store/serializers/KryoNamespaces.java
@@ -20,8 +20,8 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Maps;
-
 import com.google.common.collect.Sets;
+
 import org.onlab.packet.ChassisId;
 import org.onlab.packet.EthType;
 import org.onlab.packet.Ip4Address;
@@ -249,6 +249,7 @@
                       ImmutableMap.of().getClass(),
                       ImmutableMap.of("a", 1).getClass(),
                       ImmutableMap.of("R", 2, "D", 2).getClass())
+            .register(Collections.unmodifiableSet(Collections.emptySet()).getClass())
             .register(HashMap.class)
             .register(ConcurrentHashMap.class)
             .register(CopyOnWriteArraySet.class)
@@ -265,7 +266,6 @@
             .register(Collections.emptySet().getClass())
             .register(Optional.class)
             .register(Collections.emptyList().getClass())
-            .register(Collections.unmodifiableSet(Collections.emptySet()).getClass())
             .register(Collections.singleton(Object.class).getClass())
             .build();