Bug 5467 - BGP-LS topology provider NPE 31/36431/2
authorMilos Fabian <milfabia@cisco.com>
Fri, 18 Mar 2016 09:18:43 +0000 (10:18 +0100)
committerGerrit Code Review <gerrit@opendaylight.org>
Thu, 24 Mar 2016 08:29:13 +0000 (08:29 +0000)
Added missing null check - in a case a node attributes
are not present (so IS-IS area is missing), the NET address is not set.

Change-Id: If3a8106abb2035b1dbf28e3760f74dab5e09fca0
Signed-off-by: Milos Fabian <milfabia@cisco.com>
bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/LinkstateTopologyBuilder.java

index 76c9d290c87900c2366ecb1b50bfb276ab8add49..96bae30be829884d0cf02b77be3f1c644f447dee 100644 (file)
@@ -619,12 +619,16 @@ public final class LinkstateTopologyBuilder extends AbstractTopologyBuilder<Link
             b.setIsoSystemId(new IsoSystemId(systemId));
             b.setIsoPseudonodeId(new IsoPseudonodeId(BaseEncoding.base16().encode(new byte[] {pn.getPsn().byteValue()})));
             ab.setIso(b.build());
-            ab.setNet(toIsoNetIds(na.getIsisAreaId(), systemId));
+            if (na != null) {
+                ab.setNet(toIsoNetIds(na.getIsisAreaId(), systemId));
+            }
         } else if (ri instanceof IsisNodeCase) {
             final IsisNode in = ((IsisNodeCase) ri).getIsisNode();
             final String systemId = UriBuilder.isoId(in.getIsoSystemId());
             ab.setIso(new IsoBuilder().setIsoSystemId(new IsoSystemId(systemId)).build());
-            ab.setNet(toIsoNetIds(na.getIsisAreaId(), systemId));
+            if (na != null) {
+                ab.setNet(toIsoNetIds(na.getIsisAreaId(), systemId));
+            }
         }
 
         ab.setTed(tb.build());