osaf/services/saf/smfsv/smfd/SmfUpgradeCampaign.cc | 15 ++++-----------
1 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/osaf/services/saf/smfsv/smfd/SmfUpgradeCampaign.cc
b/osaf/services/saf/smfsv/smfd/SmfUpgradeCampaign.cc
--- a/osaf/services/saf/smfsv/smfd/SmfUpgradeCampaign.cc
+++ b/osaf/services/saf/smfsv/smfd/SmfUpgradeCampaign.cc
@@ -84,17 +84,10 @@ class SmfUpgradeProcedure;
SmfUpgradeCampaign::~SmfUpgradeCampaign()
{
TRACE_ENTER();
- //Delete merged procedure first since it contain references to other
proc
- //Check campaign state, if verify fails the campaign is still in state
initial
- //and the merged procedure is not yet created.
- int procexec = getProcExecutionMode();
- if ((procexec == SMF_MERGE_TO_SINGLE_STEP || procexec ==
SMF_BALANCED_MODE) &&
- (m_state->getState() != SA_SMF_CMPG_INITIAL)) {
- for (auto& it: m_procedure) {
- delete it;
- }
- m_procedure.clear();
- }
+ for (auto& it: m_procedure) {
+ delete it;
+ }
+ m_procedure.clear();
for (auto& it: m_originalProcedures) {
delete it;
}
------------------------------------------------------------------------------
_______________________________________________
Opensaf-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
