commit 7a1ffca5815bea11e90f526c4e7bce337bc1e6ba
author Saurav Das <sauravdas@alumni.stanford.edu> Mon Mar 28 19:00:18 2016 -0700
committer Gerrit Code Review <gerrit@onlab.us> Tue Mar 29 22:14:41 2016 +0000
tree 79b0903e793ccf586c8816134e5b77c5d8481ac0
parent f80bbb22c278310c39f4c56b2714afa6a707063d

Fixing a couple of NPEs

Change-Id: I19b5a2787b26e67e05640f6c64a13b58f2dc089a

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 df340a9..5b99105 100644
--- a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/DefaultRoutingHandler.java
+++ b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/DefaultRoutingHandler.java
@@ -564,6 +564,8 @@
 
     public void purgeEcmpGraph(DeviceId deviceId) {
         currentEcmpSpgMap.remove(deviceId);
-        updatedEcmpSpgMap.remove(deviceId);
+        if (updatedEcmpSpgMap != null) {
+            updatedEcmpSpgMap.remove(deviceId);
+        }
     }
 }