osaf/services/saf/smfsv/smfd/SmfCampaignInit.cc |  17 +++++++++++++++--
 1 files changed, 15 insertions(+), 2 deletions(-)


diff --git a/osaf/services/saf/smfsv/smfd/SmfCampaignInit.cc 
b/osaf/services/saf/smfsv/smfd/SmfCampaignInit.cc
--- a/osaf/services/saf/smfsv/smfd/SmfCampaignInit.cc
+++ b/osaf/services/saf/smfsv/smfd/SmfCampaignInit.cc
@@ -225,11 +225,24 @@ SmfCampaignInit::execute()
                 return false;
         }
 
+       TRACE("3. Read_IMM_long_DN_config_and_set_control_block()");
+       if (!immUtil.read_IMM_long_DN_config_and_set_control_block(smfd_cb)) {
+               LOG_ER("SmfCampaignInit: reading long DN config from IMM 
FAILED");
+               TRACE_LEAVE();
+               return false;
+       }
+
        std::list < SmfUpgradeAction * >::iterator upActiter;
        upActiter = m_campInitAction.begin();
        while (upActiter != m_campInitAction.end()) {
-                       SaAisErrorT rc = 
(*upActiter)->execute(SmfCampaignThread::instance()->getImmHandle(),
-                                                       &initRollbackDn);
+               TRACE("4. %s: 
read_IMM_long_DN_config_and_set_control_block()",__FUNCTION__);
+               if 
(!immUtil.read_IMM_long_DN_config_and_set_control_block(smfd_cb)) {
+                       LOG_ER("SmfCampaignInit: reading long DN config from 
IMM FAILED");
+                       TRACE_LEAVE();
+                       return false;
+               }
+               SaAisErrorT rc = 
(*upActiter)->execute(SmfCampaignThread::instance()->getImmHandle(),
+                               &initRollbackDn);
                if (rc != SA_AIS_OK) {
                        LOG_ER("SmfCampaignInit init action %d failed, rc=%s", 
(*upActiter)->getId(), saf_error(rc));
                        TRACE_LEAVE();

------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most 
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
_______________________________________________
Opensaf-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel

Reply via email to