Merge "Agent crash@ route notify" into R3.2

Juniper · Mar 5, 2017 · f3fa537 · f3fa537
2 parents 38be4be + ae4d7bb
commit f3fa537
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/src/vnsw/agent/controller/controller_export.cc b/src/vnsw/agent/controller/controller_export.cc
@@ -131,6 +131,11 @@ void RouteExport::Notify(const Agent *agent,
             return;
     }
 
+    //If channel is no more active, ignore any updates.
+    //It may happen that notify is enqueued before channel is removed.
+    if (!AgentXmppChannel::IsBgpPeerActive(agent, bgp_xmpp_peer))
+        return;
+
     if (route->is_multicast()) {
         MulticastNotify(bgp_xmpp_peer, associate, partition, e);
     } else {