From 15a8178e2e45c4baff09ddaa3eac1710609fd99a Mon Sep 17 00:00:00 2001
From: Saurav Das <sauravdas@alumni.stanford.edu>
Date: Fri, 9 Feb 2018 09:15:03 -0800
Subject: [PATCH] Fix for NPE that can get triggered upon onos instance
 restart.

Change-Id: I9ea9d8d92d43dc0543be0b336ba9bcc856b9bcbc
---
 .../org/onosproject/segmentrouting/DefaultRoutingHandler.java  | 3 +++
 1 file changed, 3 insertions(+)

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 f1a63fc5bf..3aed5ccc04 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 @@ public class DefaultRoutingHandler {
             // 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()) {