commit 39d76ec001aecea6023ea11e994c84be701372d0
author rohitsharan <r.sharan@samsung.com> Thu Apr 13 17:03:07 2017 +0530
committer Satishk-Huawei <satishk@huawei.com> Thu Apr 13 12:36:34 2017 +0000
tree 143eba207898267c3236573cb0cab777a86a81f9
parent 2dc4307c8cb4eb8a0ebd7bdbb6d2ab78ef029e81

onos-6298: null object neighbor dereferenced fix

Change-Id: I1e8ae0c022525a626f44715a33c6bd88e6d461dc

protocols/isis/ctl/src/main/java/org/onosproject/isis/controller/impl/DefaultIsisInterface.java

diff --git a/protocols/isis/ctl/src/main/java/org/onosproject/isis/controller/impl/DefaultIsisInterface.java b/protocols/isis/ctl/src/main/java/org/onosproject/isis/controller/impl/DefaultIsisInterface.java
index 49bfd74..3e031e4 100644
--- a/protocols/isis/ctl/src/main/java/org/onosproject/isis/controller/impl/DefaultIsisInterface.java
+++ b/protocols/isis/ctl/src/main/java/org/onosproject/isis/controller/impl/DefaultIsisInterface.java
@@ -863,6 +863,10 @@
             neighbor.setLocalExtendedCircuitId(stateTlv.localCircuitId());
             buildStoreAndSendSelfGeneratedLspIfNotExistInDb(channel, IsisRouterType.get(helloPacket.circuitType()));
         }
+        if (neighbor == null) {
+            log.debug("neighbor object is null!!!!");
+            return;
+        }
 
         neighbor.setHoldingTime(helloPacket.holdingTime());
         neighbor.stopInactivityTimeCheck();