commit | 1ddfea0795c7e3d177e5b0ec0ba92d630bedc818 | [log] [tgz] |
---|---|---|
author | Palash Kala <palash.kala@samsung.com> | Wed Apr 12 13:20:02 2017 +0900 |
committer | Yuta HIGUCHI <y-higuchi@onlab.us> | Fri Apr 14 22:54:46 2017 +0000 |
tree | c44b946bfd20773500b5a5a1d2aaa68cee56954c | |
parent | 89c4a64d58d20704c197692f376c7faf05a11c1f [diff] |
[ONOS-6284] Pointer passed to method where it is dereferened can be null Change-Id: I9dd4b02888e39151030afc0da91bb648c34ca053
diff --git a/apps/tetopology/app/src/main/java/org/onosproject/tetopology/management/impl/DistributedTeTopologyStore.java b/apps/tetopology/app/src/main/java/org/onosproject/tetopology/management/impl/DistributedTeTopologyStore.java index 3d6be15..151df3d 100644 --- a/apps/tetopology/app/src/main/java/org/onosproject/tetopology/management/impl/DistributedTeTopologyStore.java +++ b/apps/tetopology/app/src/main/java/org/onosproject/tetopology/management/impl/DistributedTeTopologyStore.java
@@ -1004,6 +1004,12 @@ } // Then remove it from teNodeMap InternalTeNode node = teNodeMap.remove(nodeKey); + + if (node == null) { + log.error("No node found for nodeKey {}", nodeKey); + return; + } + removeTeNodeMapEntrys(node); // Remove it from networkNodeMap if (teNodeRemove && node != null) {