osaf/services/saf/smfsv/smfd/SmfProcedureThread.cc |  6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)


If the start of the campaign failes because of IMM returning timeout when SMF 
want to create needed objects the IMM OI implementer is cleared before returning

diff --git a/osaf/services/saf/smfsv/smfd/SmfProcedureThread.cc 
b/osaf/services/saf/smfsv/smfd/SmfProcedureThread.cc
--- a/osaf/services/saf/smfsv/smfd/SmfProcedureThread.cc
+++ b/osaf/services/saf/smfsv/smfd/SmfProcedureThread.cc
@@ -325,6 +325,9 @@ SmfProcedureThread::init(void)
                        m_NCS_IPC_RELEASE(&m_mbx, NULL);
                        m_NCS_IPC_DETACH(&m_cbk_mbx, NULL, NULL);
                        m_NCS_IPC_RELEASE(&m_cbk_mbx, NULL);
+                       if (deleteImmHandle() != SA_AIS_OK) {
+                               LOG_NO("SmfProcedureThread::init, 
deleteImmHandle FAILED, re-execution of campaign may not be possible");
+                       }
                        return -1;
                }
        } else if (result == SA_AIS_OK) {
@@ -346,6 +349,9 @@ SmfProcedureThread::init(void)
                m_NCS_IPC_RELEASE(&m_mbx, NULL);
                m_NCS_IPC_DETACH(&m_cbk_mbx, NULL, NULL);
                m_NCS_IPC_RELEASE(&m_cbk_mbx, NULL);
+               if (deleteImmHandle() != SA_AIS_OK) {
+                       LOG_NO("SmfProcedureThread::init, deleteImmHandle 
FAILED, re-execution of campaign may not be possible");
+               }
                return -1;
        }
 

------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:

Build for Windows Store.

http://p.sf.net/sfu/windows-dev2dev
_______________________________________________
Opensaf-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel

Reply via email to