Fix NPE when no node present in PCEP topology config 05/81905/1
authorAjay Lele <ajayslele@gmail.com>
Wed, 10 Apr 2019 20:07:02 +0000 (13:07 -0700)
committerRobert Varga <nite@hq.sk>
Mon, 6 May 2019 08:09:25 +0000 (08:09 +0000)
Change-Id: Ia6e8be1bbe1f822673ab14a8a38307eb516e13f3
Signed-off-by: Ajay Lele <ajayslele@gmail.com>
(cherry picked from commit 5821d0da260c053849ea1b428f7609b9edb3e799)

pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/config/PCEPTopologyProviderUtil.java

index 82d44906895a0ffe041566b3d5889f84a31280cf..ced799abc3dae9cd58ea1079dae5eb9a865adc83 100644 (file)
@@ -38,6 +38,9 @@ final class PCEPTopologyProviderUtil {
 
     static KeyMapping contructKeys(@Nonnull final Topology topology) {
         final KeyMapping ret = KeyMapping.getKeyMapping();
+        if (topology.getNode() == null) {
+            return ret;
+        }
         topology.getNode().stream()
                 .filter(Objects::nonNull)
                 .filter(node -> node.augmentation(PcepNodeConfig.class) != null)
@@ -72,6 +75,9 @@ final class PCEPTopologyProviderUtil {
 
     static SpeakerIdMapping contructSpeakersId(final Topology topology) {
         final SpeakerIdMapping ret = SpeakerIdMapping.getSpeakerIdMap();
+        if (topology.getNode() == null) {
+            return ret;
+        }
         topology.getNode().stream()
                 .filter(Objects::nonNull)
                 .filter(node -> node.augmentation(PcepNodeConfig.class) != null)