Merge "* Ignore vrf delete notification if vrf state is NULL There ma…

…y be a duplicate delete notified for VRF in case quick addition and deletion, if vrf state is not set then ignore delete notification. Closes-bug:#1557427,#1557422" into R3.0
Juniper · Mar 15, 2016 · 23b51ef · 23b51ef
2 parents 43e1d58 + f8a0969
commit 23b51ef
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/vnsw/agent/oper/path_preference.cc b/src/vnsw/agent/oper/path_preference.cc
@@ -1058,9 +1058,11 @@ void PathPreferenceModule::VrfNotify(DBTablePartBase *partition,
        static_cast<PathPreferenceVrfState *>(e->GetState(partition->parent(),
                                                           vrf_id_));
 
-   if (vrf->IsDeleted() && vrf_state) {
-       e->ClearState(partition->parent(), vrf_id_);
-       delete vrf_state;
+   if (vrf->IsDeleted()) {
+       if (vrf_state) {
+           e->ClearState(partition->parent(), vrf_id_);
+           delete vrf_state;
+       }
        return;
    }