From 65f63c1647f59b75b3d06b1cb293efbbc5472012 Mon Sep 17 00:00:00 2001
From: "Sudharsan D.G" <sudharsan_gopalarath@dell.com>
Date: Fri, 4 Sep 2020 09:34:05 -0700
Subject: [PATCH] Sflow fixes during DEL processing (#1427)

Co-authored-by: dgsudharsan <sudharsan_gopalarat@dell.com>
---
 cfgmgr/sflowmgr.cpp | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/cfgmgr/sflowmgr.cpp b/cfgmgr/sflowmgr.cpp
index 98d6a7775696..81a76dcec46e 100644
--- a/cfgmgr/sflowmgr.cpp
+++ b/cfgmgr/sflowmgr.cpp
@@ -328,7 +328,10 @@ void SflowMgr::doTask(Consumer &consumer)
                     }
                     sflowCheckAndFillValues(key,values);
                     m_sflowPortConfMap[key].local_conf = true;
-                    m_appSflowSessionTable.set(key, values);
+                    if (m_gEnable)
+                    {
+                        m_appSflowSessionTable.set(key, values);
+                    }
                 }
             }
         }
@@ -340,6 +343,7 @@ void SflowMgr::doTask(Consumer &consumer)
                 {
                     sflowHandleService(false);
                     sflowHandleSessionAll(false);
+                    sflowHandleSessionLocal(false);
                 }
                 m_gEnable = false;
                 m_appSflowTable.del(key);
@@ -350,7 +354,10 @@ void SflowMgr::doTask(Consumer &consumer)
                 {
                     if (!m_intfAllConf)
                     {
-                        sflowHandleSessionAll(true);
+                        if (m_gEnable)
+                        {
+                            sflowHandleSessionAll(true);
+                        }
                     }
                     m_intfAllConf = true;
                 }