commit bcc422822aec2a4cceb8ea35c3f7d4eb57196759
author Jian Li <pyguni@gmail.com> Thu Sep 13 20:59:34 2018 +0900
committer Jian Li <pyguni@gmail.com> Fri Sep 14 04:35:27 2018 +0000
tree 8a6d2110a0cd5101996c7595092ebc66a65ea871
parent 319b9abaab1bdd4b0120774f219e08c8a22469bc

Fix: resolve a set of NPEs due to security group activation

Change-Id: Idfd93c80f710e85370f9054d93b9b7e96c77fd49

apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingFloatingIpHandler.java

diff --git a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingFloatingIpHandler.java b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingFloatingIpHandler.java
index 21324bf..f0c0550 100644
--- a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingFloatingIpHandler.java
+++ b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingFloatingIpHandler.java
@@ -860,6 +860,11 @@
                 case OPENSTACK_PORT_PRE_REMOVE:
                     InstancePort instPort =
                             instancePortService.instancePort(event.port().getId());
+
+                    if (instPort == null) {
+                        break;
+                    }
+
                     NetFloatingIP fip =
                             associatedFloatingIp(instPort, osRouterAdminService.floatingIps());