commit 0f8d00ef82425bbb726147a7ce89b064736b8661
author Sahil Lele <sahil@onlab.us> Fri Jul 24 11:05:43 2015 -0700
committer Gerrit Code Review <gerrit@onlab.us> Fri Jul 24 18:51:43 2015 +0000
tree 9f23ecf3cc38aeddc34a67cee876b18284c8220a
parent 4e0e0936a60778db65e86ae6bc7f122b2b40222e

ONOS-2432 Fixed blackhole npe by only acting on src and dst hosts that are not null

Change-Id: Iae587a8b873b0d697bb6d723be2afafd9bb56de4

apps/fwd/src/main/java/org/onosproject/fwd/ReactiveForwarding.java

diff --git a/apps/fwd/src/main/java/org/onosproject/fwd/ReactiveForwarding.java b/apps/fwd/src/main/java/org/onosproject/fwd/ReactiveForwarding.java
index 6aa040b..f63d65d 100644
--- a/apps/fwd/src/main/java/org/onosproject/fwd/ReactiveForwarding.java
+++ b/apps/fwd/src/main/java/org/onosproject/fwd/ReactiveForwarding.java
@@ -698,18 +698,23 @@
 
         for (SrcDstPair sd : pairs) {
             // get the edge deviceID for the src host
-            DeviceId srcId = hostService.getHost(HostId.hostId(sd.src)).location().deviceId();
-            DeviceId dstId = hostService.getHost(HostId.hostId(sd.dst)).location().deviceId();
-            log.trace("SRC ID is " + srcId + ", DST ID is " + dstId);
+            Host srcHost = hostService.getHost(HostId.hostId(sd.src));
+            Host dstHost = hostService.getHost(HostId.hostId(sd.dst));
+            if (srcHost != null && dstHost != null) {
+                DeviceId srcId = srcHost.location().deviceId();
+                DeviceId dstId = dstHost.location().deviceId();
+                log.trace("SRC ID is " + srcId + ", DST ID is " + dstId);
 
-            cleanFlowRules(sd, egress.deviceId());
+                cleanFlowRules(sd, egress.deviceId());
 
-            Set<Path> shortestPaths = srcPaths.get(srcId);
-            if (shortestPaths == null) {
-                shortestPaths = topologyService.getPaths(topologyService.currentTopology(), egress.deviceId(), srcId);
-                srcPaths.put(srcId, shortestPaths);
+                Set<Path> shortestPaths = srcPaths.get(srcId);
+                if (shortestPaths == null) {
+                    shortestPaths = topologyService.getPaths(topologyService.currentTopology(),
+                            egress.deviceId(), srcId);
+                    srcPaths.put(srcId, shortestPaths);
+                }
+                backTrackBadNodes(shortestPaths, dstId, sd);
             }
-            backTrackBadNodes(shortestPaths, dstId, sd);
         }
     }