commit ea702b11dc6dbcc97c1337dffe3d784a6d2b932c
author Charles Chan <rascov@gmail.com> Wed Nov 30 11:55:05 2016 -0800
committer Brian O'Connor <bocon@onlab.us> Wed Nov 30 20:12:28 2016 +0000
tree a4b61e76a5ea7d0d25520dd54ee1081f16c00794
parent f0f592d0b004276c799b0122c11619cf9b209af4

Fix NPE when revoking routes

Change-Id: Ie086fb2ea947fd909c2c1416c3da9cac22014dd1

src/main/java/org/onosproject/segmentrouting/RoutingRulePopulator.java

diff --git a/src/main/java/org/onosproject/segmentrouting/RoutingRulePopulator.java b/src/main/java/org/onosproject/segmentrouting/RoutingRulePopulator.java
index 9196424..e12fbcc 100644
--- a/src/main/java/org/onosproject/segmentrouting/RoutingRulePopulator.java
+++ b/src/main/java/org/onosproject/segmentrouting/RoutingRulePopulator.java
@@ -147,6 +147,11 @@
             log.warn(e.getMessage() + " Aborting revokeIpRuleForHost.");
             return;
         }
+        if (fwdBuilder == null) {
+            log.warn("Aborting host routing table entries due "
+                    + "to error for dev:{} route:{}", deviceId, prefix);
+            return;
+        }
         ObjectiveContext context = new DefaultObjectiveContext(
                 (objective) -> log.debug("IP rule for route {} revoked", prefix),
                 (objective, error) ->