Merge "Fix Agent crash in FlowStatsCollector::DeleteEvent"

Juniper · May 11, 2016 · a82c99e · a82c99e
2 parents 12e60b1 + 1e9a732
commit a82c99e
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/vnsw/agent/vrouter/flow_stats/flow_stats_manager.cc b/src/vnsw/agent/vrouter/flow_stats/flow_stats_manager.cc
@@ -279,8 +279,11 @@ void FlowStatsManager::DeleteEvent(const FlowEntryPtr &flow,
         return;
     }
     FlowStatsCollector *fsc = flow->fsc();
-    assert(fsc != NULL);
-    fsc->DeleteEvent(flow, params);
+    /* Ignore delete requests if FlowStatsCollector is NULL */
+    if (fsc != NULL) {
+        fsc->DeleteEvent(flow, params);
+        flow->set_fsc(NULL);
+    }
 }
 
 void FlowStatsManager::UpdateStatsEvent(const FlowEntryPtr &flow,