commit bcb0237f3bfd840677dc0d0df7d8918a8f2eef19
author Ayaka Koshibe <ayaka@onlab.us> Mon Jun 01 10:56:42 2015 -0700
committer Gerrit Code Review <gerrit@onlab.us> Mon Jun 01 18:26:17 2015 +0000
tree 8e5118ea08bba85444ce6a19ba31ca4968069222
parent 17ff25fe9175eadb699e89e36b5f1ed6b08d581d

Bug fixes for Optical Intent installation and removal

 - Missing serializer for OchSignalTypes
 - Aliasing of transactional maps in *ResourceStores
 - NPE during Intent removal

Conflicts:
	apps/optical/src/main/java/org/onosproject/optical/OpticalPathProvisioner.java

Change-Id: If882c48553a4a594341ddb743e0c3f420656d954

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 4eb8c7a..d8274ff 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
@@ -64,6 +64,7 @@
 import org.onosproject.net.LinkKey;
 import org.onosproject.net.OchPort;
 import org.onosproject.net.OchSignal;
+import org.onosproject.net.OchSignalType;
 import org.onosproject.net.OduCltPort;
 import org.onosproject.net.OduSignalType;
 import org.onosproject.net.OmsPort;
@@ -408,6 +409,7 @@
             .register(OmsPort.class)
             .register(OchPort.class)
             .register(OduSignalType.class)
+            .register(OchSignalType.class)
             .register(GridType.class)
             .register(ChannelSpacing.class)
             .register(OduCltPort.class)