commit d6f0c9e607c2c139667a4db43ec918086759b8a1
author lishuai <lishuai12@huawei.com> Wed Dec 16 11:40:01 2015 +0800
committer Gerrit Code Review <gerrit@onlab.us> Wed Dec 16 19:53:10 2015 +0000
tree fc61d220c6426f7d8007c1d7fd4e166f966ec339
parent 7ba33f498ed2a722c0adfb9c2d7179d7a39e6827

[ONOS-3624] update vtnweb's bug and add Not-Null constraints of export.

Change-Id: I7699d8766f0653f5fafd4b32a68051994f43b00e

apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/manager/impl/VTNManager.java

diff --git a/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/manager/impl/VTNManager.java b/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/manager/impl/VTNManager.java
index 53fa64a..ac898d1 100644
--- a/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/manager/impl/VTNManager.java
+++ b/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/manager/impl/VTNManager.java
@@ -413,7 +413,9 @@
         if (type == Objective.Operation.ADD) {
             // Save external port
             Port export = getExPort(device.id());
-            exPortOfDevice.put(device.id(), export);
+            if (export != null) {
+                exPortOfDevice.put(device.id(), export);
+            }
             switchOfLocalHostPorts.put(device.id(), new NetworkOfLocalHostPorts());
         } else if (type == Objective.Operation.REMOVE) {
             exPortOfDevice.remove(device.id());
@@ -777,7 +779,7 @@
         for (RouterInterface r : interfacesSet) {
             // Get all the host of the subnet
             Map<HostId, Host> hosts = hostsOfSubnet.get(r.subnetId());
-            if (hosts.size() > 0) {
+            if (hosts != null && hosts.size() > 0) {
                 subnetVmNum++;
                 if (subnetVmNum >= SUBNET_NUM) {
                     routerInfFlagOfTenant.put(r.tenantId(), true);