From: Tomas Cechvala <tcechval@cisco.com>
Date: Tue, 14 Apr 2015 06:50:38 +0000 (-0700)
Subject: Added checking at DestinationMapper
X-Git-Tag: release/lithium~112
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=4f362756b6d481147f290449910dd35e35e7a347;p=groupbasedpolicy.git

Added checking at DestinationMapper

createRouterArpFlow in DestinationMaper is checked for null value.

Signed-off-by: Tomas Cechvala <tcechval@cisco.com>
---

diff --git a/renderers/ofoverlay/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/flow/DestinationMapper.java b/renderers/ofoverlay/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/flow/DestinationMapper.java
index b779fc5ef..6ecba8879 100644
--- a/renderers/ofoverlay/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/flow/DestinationMapper.java
+++ b/renderers/ofoverlay/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/flow/DestinationMapper.java
@@ -153,8 +153,14 @@ public class DestinationMapper extends FlowTable {
         }
         // Write subnet flows
         for (Integer subnetKey : subnetsByL3c.keySet()) {
-            for(Subnet sn:subnetsByL3c.get(subnetKey)) {
-                flowMap.writeFlow(nodeId, TABLE_ID, createRouterArpFlow(nodeId, sn, subnetKey));
+            for (Subnet sn : subnetsByL3c.get(subnetKey)) {
+                Flow arpFlow = createRouterArpFlow(nodeId, sn, subnetKey);
+                if (arpFlow != null) {
+                    flowMap.writeFlow(nodeId, TABLE_ID, arpFlow);
+                } else {
+                    LOG.debug("ARP flow is not created, because virtual router IP has not been set for subnet "
+                            + sn.getIpPrefix().getValue() + ".");
+                }
             }
         }
         // Write broadcast flows per flood domain.