commit e113df4c1d12ab549ef71fd63bd57bf59b95daf3
author Luca Prete <luca@onlab.us> Thu Dec 22 15:52:06 2016 -0800
committer Jonathan Hart <jono@onlab.us> Wed Jan 11 17:54:57 2017 +0000
tree 20bd8e7a1af7281eb024822e1cf4ee4801619724
parent 1f1fef77bebc9151f15f6d2930a469317542877e

ONOS-5727: Correcting configuration load in VPLS

Change-Id: Iaea600e6abd504f876ba5f9559fc99d0b6cb401c

apps/vpls/src/main/java/org/onosproject/vpls/config/impl/VplsConfigImpl.java

diff --git a/apps/vpls/src/main/java/org/onosproject/vpls/config/impl/VplsConfigImpl.java b/apps/vpls/src/main/java/org/onosproject/vpls/config/impl/VplsConfigImpl.java
index ad1c707..36da63c 100644
--- a/apps/vpls/src/main/java/org/onosproject/vpls/config/impl/VplsConfigImpl.java
+++ b/apps/vpls/src/main/java/org/onosproject/vpls/config/impl/VplsConfigImpl.java
@@ -85,7 +85,7 @@
 
     private final Set<String> vplsAffectedByApi = new HashSet<>();
 
-    private VplsAppConfig vplsAppConfig = new VplsAppConfig();
+    private VplsAppConfig vplsAppConfig = null;
 
     private SetMultimap<String, String> ifacesOfVpls = HashMultimap.create();
     private SetMultimap<String, String> oldIfacesOfVpls = HashMultimap.create();
@@ -278,8 +278,7 @@
 
         if (vplsAppConfig == null) {
             log.warn(CONFIG_NULL);
-            configService.addConfig(vplsAppId, VplsAppConfig.class);
-            return;
+            vplsAppConfig = configService.addConfig(vplsAppId, VplsAppConfig.class);
         }
 
         oldIfacesOfVpls = ifacesOfVpls;