commit | 970c6e5ff1ea700a0621574aa8abd42fb4eeae61 | [log] [tgz] |
---|---|---|
author | Jian Li <pyguni@gmail.com> | Tue Dec 24 21:39:33 2019 +0900 |
committer | Jian Li <pyguni@gmail.com> | Tue Dec 24 23:10:24 2019 +0900 |
tree | 602bc168a8193443f85c64bc28dcc805ca64bf44 | |
parent | 8143c3b74654d7ff3d1bd9b78f5dd8221ed76007 [diff] |
Fix: do not propagate PORT_REMOVED event if the event has null value Change-Id: I0cfe520a8910e7aea6b182836deb6dc8469c8e7c
diff --git a/apps/k8s-networking/app/src/main/java/org/onosproject/k8snetworking/impl/DistributedK8sNetworkStore.java b/apps/k8s-networking/app/src/main/java/org/onosproject/k8snetworking/impl/DistributedK8sNetworkStore.java index 9117e31..301aa0e 100644 --- a/apps/k8s-networking/app/src/main/java/org/onosproject/k8snetworking/impl/DistributedK8sNetworkStore.java +++ b/apps/k8s-networking/app/src/main/java/org/onosproject/k8snetworking/impl/DistributedK8sNetworkStore.java
@@ -262,10 +262,17 @@ break; case REMOVE: log.debug("Kubernetes port removed"); - notifyDelegate(new K8sNetworkEvent( - K8S_PORT_REMOVED, - network(event.oldValue().value().networkId()), - event.oldValue().value())); + + // if the event object has invalid port value, we do not + // propagate K8S_PORT_REMOVED event. + if (event.oldValue() != null && + event.oldValue().value() != null) { + notifyDelegate(new K8sNetworkEvent( + K8S_PORT_REMOVED, + network(event.oldValue().value().networkId()), + event.oldValue().value())); + } + break; default: // do nothing