Merge "* Dont fetch mac address if interface is NULL Closes-bug:#1599…

…247"
Juniper · Jul 8, 2016 · 1691c67 · 1691c67
2 parents d7cf754 + 18e1ada
commit 1691c67
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/src/vnsw/agent/oper/agent_path.cc b/src/vnsw/agent/oper/agent_path.cc
@@ -662,11 +662,14 @@ bool LocalVmRoute::AddChangePath(Agent *agent, AgentPath *path,
         policy = true;
     }
 
-    MacAddress mac = vm_port->vm_mac();
-    const InetUnicastRouteEntry *ip_rt =
-        dynamic_cast<const InetUnicastRouteEntry *>(rt);
-    if (ip_rt) {
-        mac = vm_port->GetIpMac(ip_rt->addr(), ip_rt->plen());
+    MacAddress mac = MacAddress::ZeroMac();
+    if (vm_port) {
+        mac = vm_port->vm_mac();
+        const InetUnicastRouteEntry *ip_rt =
+            dynamic_cast<const InetUnicastRouteEntry *>(rt);
+        if (ip_rt) {
+            mac = vm_port->GetIpMac(ip_rt->addr(), ip_rt->plen());
+        }
     }
 
     InterfaceNHKey key(intf_.Clone(), policy, flags_, mac);