Fix NPE and minor changes

[unimgr.git] / netvirt / src / main / java / org / opendaylight / unimgr / mef / netvirt / EvcListener.java

diff --git a/netvirt/src/main/java/org/opendaylight/unimgr/mef/netvirt/EvcListener.java b/netvirt/src/main/java/org/opendaylight/unimgr/mef/netvirt/EvcListener.java
index bab6307c910a17b67de9aa8129f69f09d859c6e4..6ad6751444507584680accad7116c605015e0ff5 100644 (file)
--- a/netvirt/src/main/java/org/opendaylight/unimgr/mef/netvirt/EvcListener.java
+++ b/netvirt/src/main/java/org/opendaylight/unimgr/mef/netvirt/EvcListener.java
@@ -96,6 +96,10 @@ public class EvcListener extends UnimgrDataTreeChangeListener<Evc> {
                 NetvirtUtils.createElanInstance(dataBroker, instanceName, isEtree);
             }
             // Create interfaces
+            if (data.getUnis() == null) {
+                log.info("No UNI's in service {}, exiting", instanceName);
+                return;
+            }
             for (Uni uni : data.getUnis().getUni()) {
                 if (!uni.isAdminStateEnabled()) {
                     log.info("uni {} AdminStateEnabled false", uni.getUniId().getValue());