commit 0488c73c2013804efe40e98621b29792331b33ad
author Jian Li <pyguni@gmail.com> Fri Sep 14 20:53:07 2018 +0900
committer Jian Li <pyguni@gmail.com> Sat Sep 15 01:38:56 2018 +0900
tree d6f805a0cddfd4a2b7b161cb8fbbd9fffcb0c3ef
parent 8a5fb64ed8392a3a46a87517cbaef76992b94090

Fix: resolve a set of NPEs and WARNs caused by null instance port

Change-Id: I62b1c21cb9fac7d38924e85838a435737664f6c0

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

diff --git a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/DistributedInstancePortStore.java b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/DistributedInstancePortStore.java
index e9d2b2f..f48bdc3 100644
--- a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/DistributedInstancePortStore.java
+++ b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/DistributedInstancePortStore.java
@@ -50,6 +50,7 @@
 import static org.onosproject.openstacknetworking.api.InstancePort.State.INACTIVE;
 import static org.onosproject.openstacknetworking.api.InstancePort.State.MIGRATED;
 import static org.onosproject.openstacknetworking.api.InstancePort.State.MIGRATING;
+import static org.onosproject.openstacknetworking.api.InstancePort.State.REMOVE_PENDING;
 import static org.onosproject.openstacknetworking.api.InstancePortEvent.Type.OPENSTACK_INSTANCE_MIGRATION_ENDED;
 import static org.onosproject.openstacknetworking.api.InstancePortEvent.Type.OPENSTACK_INSTANCE_MIGRATION_STARTED;
 import static org.onosproject.openstacknetworking.api.InstancePortEvent.Type.OPENSTACK_INSTANCE_PORT_DETECTED;
@@ -224,6 +225,11 @@
                 return;
             }
 
+            // we do not trigger instance port update for pending state transition
+            if (newState == REMOVE_PENDING) {
+                return;
+            }
+
             notifyDelegate(new InstancePortEvent(
                     OPENSTACK_INSTANCE_PORT_UPDATED,
                     event.newValue().value()));