Refactor tapi-delete-connectivity service rpc

[transportpce.git] / tapi / src / main / java / org / opendaylight / transportpce / tapi / topology / TapiPortMappingListener.java

diff --git a/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/TapiPortMappingListener.java b/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/TapiPortMappingListener.java
index 1e2e7ce4d57baef642421bc6c0479fe471894c3b..0d1fbeee843ffedb29711fd5c6b19052605b57cc 100644 (file)
--- a/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/TapiPortMappingListener.java
+++ b/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/TapiPortMappingListener.java
@@ -58,6 +58,9 @@ public class TapiPortMappingListener implements DataTreeChangeListener<Nodes> {
                     for (Map.Entry<MappingKey, Mapping> entry : mappingAft.entrySet()) {
                         Mapping oldMapping = mappingBef.get(entry.getKey());
                         Mapping newMapping = mappingAft.get(entry.getKey());
+                        if (oldMapping == null || newMapping == null) {
+                            continue;
+                        }
                         if (!oldMapping.getPortAdminState().equals(newMapping.getPortAdminState())
                                 || !oldMapping.getPortOperState().equals(newMapping.getPortOperState())) {
                             this.tapiNetworkModelService.updateTapiTopology(nodeId, entry.getValue());