commit 745a5e93a01a05043c349c93c0674bb769d86ef3
author Saurav Das <sauravdas@alumni.stanford.edu> Fri Feb 09 09:15:03 2018 -0800
committer Thomas Vachuska <tom@opennetworking.org> Fri Feb 09 10:50:13 2018 -0800
tree 85d59f35ee69348f505bb06ce4ed9a3c27d7ae33
parent 0d79774ac4b937772b2b36ab6e72ebcfe4f0fca3

Fix for NPE that can get triggered upon onos instance restart.

Change-Id: I9ea9d8d92d43dc0543be0b336ba9bcc856b9bcbc

apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/DefaultRoutingHandler.java

diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/DefaultRoutingHandler.java b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/DefaultRoutingHandler.java
index 907d1f8..b22a89a 100644
--- a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/DefaultRoutingHandler.java
+++ b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/DefaultRoutingHandler.java
@@ -263,6 +263,9 @@
             // new ECMPspg calculation as it is not a topology event. As a
             // result, we use the current/existing ECMPspg in the updated map
             // used by the redoRouting method.
+            if (updatedEcmpSpgMap == null) {
+                updatedEcmpSpgMap = new HashMap<>();
+            }
             currentEcmpSpgMap.entrySet().forEach(entry -> {
                 updatedEcmpSpgMap.put(entry.getKey(), entry.getValue());
                 if (log.isDebugEnabled()) {