commit 9bf01a1d39ae9f46d654e2d4f9f113d158848de1
author Palash Kala <palash.kala@samsung.com> Thu Mar 30 14:08:55 2017 +0900
committer Satishk-Huawei <satishk@huawei.com> Thu Mar 30 05:48:40 2017 +0000
tree 56c58adaeb549366ee686c274a1f9271315ff695
parent 247ab15c869da6f0b44b6064ba77fd4c45c75051

deferencing a null pointer, before it is checked

Change-Id: I467fc0ba8b9fe4698eabf39657e241403badbf1b

protocols/ospf/ctl/src/main/java/org/onosproject/ospf/controller/impl/OspfNbrImpl.java

diff --git a/protocols/ospf/ctl/src/main/java/org/onosproject/ospf/controller/impl/OspfNbrImpl.java b/protocols/ospf/ctl/src/main/java/org/onosproject/ospf/controller/impl/OspfNbrImpl.java
index f563a39..666cfaa 100644
--- a/protocols/ospf/ctl/src/main/java/org/onosproject/ospf/controller/impl/OspfNbrImpl.java
+++ b/protocols/ospf/ctl/src/main/java/org/onosproject/ospf/controller/impl/OspfNbrImpl.java
@@ -1902,20 +1902,19 @@
 
                     String key = (String) itr.next();
                     OspfLsa lsa = txList.get(key);
-                    if ((lsa.age() + OspfParameters.INFTRA_NS_DELAY) >= OspfParameters.MAXAGE) {
-                        ((LsaHeader) lsa.lsaHeader()).setAge(OspfParameters.MAXAGE);
-                    } else {
-                        ((LsaHeader) lsa.lsaHeader()).setAge(lsa.age() + OspfParameters.INFTRA_NS_DELAY);
-                    }
-
-                    if ((currentLength + ((LsaHeader) lsa.lsaHeader()).lsPacketLen()) >= maxSize) {
-                        itr.previous();
-                        break;
-                    }
-                    log.debug("FloodingTimer::LSA Type::{}, Header: {}, LSA: {}", lsa.getOspfLsaType(),
-                              lsa.lsaHeader(), lsa);
-
                     if (lsa != null) {
+                        if ((lsa.age() + OspfParameters.INFTRA_NS_DELAY) >= OspfParameters.MAXAGE) {
+                            ((LsaHeader) lsa.lsaHeader()).setAge(OspfParameters.MAXAGE);
+                        } else {
+                            ((LsaHeader) lsa.lsaHeader()).setAge(lsa.age() + OspfParameters.INFTRA_NS_DELAY);
+                        }
+
+                        if ((currentLength + ((LsaHeader) lsa.lsaHeader()).lsPacketLen()) >= maxSize) {
+                            itr.previous();
+                            break;
+                        }
+                        log.debug("FloodingTimer::LSA Type::{}, Header: {}, LSA: {}", lsa.getOspfLsaType(),
+                                  lsa.lsaHeader(), lsa);
                         lsupdate.addLsa(lsa);
                         noLsa++;
                         currentLength = currentLength + ((LsaHeader) lsa.lsaHeader()).lsPacketLen();