commit 08e457ab8ba31e4f91f936d28ce0fa8b91ce94ef
author Ayaka Koshibe <ayaka@onlab.us> Thu Jun 25 17:11:54 2015 -0700
committer Gerrit Code Review <gerrit@onlab.us> Sat Jun 27 18:11:40 2015 +0000
tree 818037d654f855fca0d9434ec80c37a822bd99f2
parent 43e9c9cfb501726fb44a4f7f9a9171f4a377c7a9

Serializer for DefaultAnnotations. This allows Annotated objects to be correctly
used as keys in ConsistentMaps. Fixes ONOS-2128.

Change-Id: Ia21a25712351b99bc1b79dc231be8187cf3d3a0b

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 3c14cb0..8996e3b 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
@@ -264,7 +264,6 @@
                     Device.Type.class,
                     Port.Type.class,
                     ChassisId.class,
-                    DefaultAnnotations.class,
                     DefaultControllerNode.class,
                     DefaultDevice.class,
                     DefaultDeviceDescription.class,
@@ -411,6 +410,7 @@
             .register(new MastershipTermSerializer(), MastershipTerm.class)
             .register(new HostLocationSerializer(), HostLocation.class)
             .register(new DefaultOutboundPacketSerializer(), DefaultOutboundPacket.class)
+            .register(new AnnotationsSerializer(), DefaultAnnotations.class)
             .register(Versioned.class)
             .register(MapEvent.class)
             .register(MapEvent.Type.class)