commit b8664b846cb8ff14eef12695dd3df5e4e1ae00f7
author Charles Chan <rascov@gmail.com> Thu Jun 22 14:15:05 2017 -0700
committer Ray Milkey <ray@onlab.us> Thu Jun 22 21:35:36 2017 +0000
tree 6fe75041be4b2b5ca6c17b14aff106e92d9a438e
parent b6ee9e966f85d6ee32eff6bff77bb61d7c6e40d4

[WIP] Fix RouteHandlere NPE

Change-Id: Ic5711365a5e82ba2465be8b0734898561d93d76a

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

diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/RouteHandler.java b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/RouteHandler.java
index d97b5ac..bb9f202 100644
--- a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/RouteHandler.java
+++ b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/RouteHandler.java
@@ -27,6 +27,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Objects;
+
 /**
  * Handles RouteEvent and manages routing entries.
  */
@@ -55,6 +57,11 @@
     }
 
     private void processRouteAddedInternal(ResolvedRoute route) {
+        if (!isReady()) {
+            log.info("System is not ready. Skip adding route for {}", route.prefix());
+            return;
+        }
+
         IpPrefix prefix = route.prefix();
         MacAddress nextHopMac = route.nextHopMac();
         VlanId nextHopVlan = route.nextHopVlan();
@@ -78,6 +85,11 @@
     }
 
     private void processRouteRemovedInternal(ResolvedRoute route) {
+        if (!isReady()) {
+            log.info("System is not ready. Skip removing route for {}", route.prefix());
+            return;
+        }
+
         IpPrefix prefix = route.prefix();
         MacAddress nextHopMac = route.nextHopMac();
         VlanId nextHopVlan = route.nextHopVlan();
@@ -88,4 +100,10 @@
         srManager.routingRulePopulator.revokeRoute(
                 location.deviceId(), prefix, nextHopMac, nextHopVlan, location.port());
     }
+
+    private boolean isReady() {
+        return Objects.nonNull(srManager.deviceConfiguration) &&
+                Objects.nonNull(srManager.defaultRoutingHandler) &&
+                Objects.nonNull(srManager.routingRulePopulator);
+    }
 }