commit f31d2d933d4189652129f25119ea117ecc1a9caa
author Yi Tseng <a86487817@gmail.com> Wed May 17 18:03:33 2017 -0700
committer Luca Prete <luca@onlab.us> Thu May 18 21:42:24 2017 +0000
tree 79fcca583135a76883529a3f599b69d3a2b134e5
parent 4f8a377740f078dd1b6439a6646237b1ff33cdf1

[ONOS-6486] Fix serializer error and NPE of VplsStore

Change-Id: I134203c92eb9e3ce70673b17561cc74a66b1eca8

apps/vpls/src/main/java/org/onosproject/vpls/store/DistributedVplsStore.java

diff --git a/apps/vpls/src/main/java/org/onosproject/vpls/store/DistributedVplsStore.java b/apps/vpls/src/main/java/org/onosproject/vpls/store/DistributedVplsStore.java
index 1743491..6d58457 100644
--- a/apps/vpls/src/main/java/org/onosproject/vpls/store/DistributedVplsStore.java
+++ b/apps/vpls/src/main/java/org/onosproject/vpls/store/DistributedVplsStore.java
@@ -62,7 +62,9 @@
 
     private static final KryoNamespace APP_KRYO = KryoNamespace.newBuilder()
             .register(KryoNamespaces.API)
+            .register(Interface.class)
             .register(VplsData.class)
+            .register(VplsData.VplsState.class)
             .register(VplsOperation.class)
             .build();
 
@@ -163,6 +165,10 @@
      */
     public void writeVplsToNetConfig(Collection<VplsData> vplsDataCollection) {
         VplsAppConfig config = networkConfigService.addConfig(appId, VplsAppConfig.class);
+        if (config == null) {
+            log.debug("VPLS config is not available now");
+            return;
+        }
         config.clearVplsConfig();
 
         // Setup update time for this VPLS application configuration