Ack from me. Best regards, Zoran
-----Original Message----- From: [email protected] [mailto:[email protected]] Sent: den 18 september 2014 14:38 To: Anders Björnerstedt; Zoran Milinkovic Cc: [email protected] Subject: [PATCH 1 of 1] imm:corrected uninitalized error code in ccb delete and Completed rsp [#1103] osaf/services/saf/immsv/immnd/ImmModel.cc | 1 + osaf/services/saf/immsv/immnd/immnd_evt.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/osaf/services/saf/immsv/immnd/ImmModel.cc b/osaf/services/saf/immsv/immnd/ImmModel.cc --- a/osaf/services/saf/immsv/immnd/ImmModel.cc +++ b/osaf/services/saf/immsv/immnd/ImmModel.cc @@ -9133,6 +9133,7 @@ ImmModel::ccbWaitForDeleteImplAck(SaUint if(i1 == sCcbVector.end() || (!(*i1)->isActive()) ) { TRACE_5("CCb %u terminated during ccbObjectDelete processing, " "ccb must be aborted", ccbId); + *err = SA_AIS_ERR_FAILED_OPERATION; return false; } CcbInfo* ccb = *i1; diff --git a/osaf/services/saf/immsv/immnd/immnd_evt.c b/osaf/services/saf/immsv/immnd/immnd_evt.c --- a/osaf/services/saf/immsv/immnd/immnd_evt.c +++ b/osaf/services/saf/immsv/immnd/immnd_evt.c @@ -3637,7 +3637,7 @@ static void immnd_evt_proc_ccb_obj_delet immModel_ccbObjDelContinuation(cb, &(evt->info.ccbUpcallRsp), &reqConn, &augDelete); - SaAisErrorT err; + SaAisErrorT err = SA_AIS_OK; if (!immModel_ccbWaitForDeleteImplAck(cb, evt->info.ccbUpcallRsp.ccbId, &err, augDelete) && reqConn) { @@ -3699,7 +3699,7 @@ static void immnd_evt_proc_ccb_compl_rsp IMMSV_EVT send_evt; IMMND_IMM_CLIENT_NODE *cl_node = NULL; IMMND_IMM_CLIENT_NODE *oi_cl_node = NULL; - SaAisErrorT err; + SaAisErrorT err = SA_AIS_OK; SaUint32T reqConn = 0; SaUint32T pbeConn = 0; NCS_NODE_ID pbeNodeId = 0; ------------------------------------------------------------------------------ Want excitement? Manually upgrade your production database. When you want reliability, choose Perforce Perforce version control. Predictably reliable. http://pubads.g.doubleclick.net/gampad/clk?id=157508191&iu=/4140/ostg.clktrk _______________________________________________ Opensaf-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/opensaf-devel
