Ack from me. /AndersBj
-----Original Message----- From: [email protected] [mailto:[email protected]] Sent: den 22 januari 2015 07:47 To: Anders Björnerstedt; Zoran Milinkovic Cc: [email protected] Subject: [PATCH 1 of 1] imm : Added IMM_ERROR check for out_evt type in AugmentCcbInitialize [#1243] osaf/libs/agents/saf/imma/imma_oi_api.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) If the pending incoming FEVS messages reached greater than 16 and TRY_AGAIN is returned. The returned type is IMMA_EVT_ND2A_IMM_ERROR. For the saImmOiAugmentCcbInitialize API when comparing out_evt the returned type is IMMA_EVT_ND2A_CCB_AUG_INIT_RSP. since the out_evt type did not match the application will be asserted. Th solution is to check IMMA_EVT_ND2A_IMM_ERROR along with IMMA_EVT_ND2A_CCB_AUG_INIT_RSP diff --git a/osaf/libs/agents/saf/imma/imma_oi_api.c b/osaf/libs/agents/saf/imma/imma_oi_api.c --- a/osaf/libs/agents/saf/imma/imma_oi_api.c +++ b/osaf/libs/agents/saf/imma/imma_oi_api.c @@ -3593,7 +3593,8 @@ SaAisErrorT saImmOiAugmentCcbInitialize( osafassert(out_evt); /* Process the received Event */ osafassert(out_evt->type == IMMSV_EVT_TYPE_IMMA); - osafassert(out_evt->info.imma.type == IMMA_EVT_ND2A_CCB_AUG_INIT_RSP); + osafassert((out_evt->info.imma.type == IMMA_EVT_ND2A_CCB_AUG_INIT_RSP) + || (out_evt->info.imma.type == IMMA_EVT_ND2A_IMM_ERROR)); adminOwnerId = out_evt->info.imma.info.admInitRsp.ownerId; rc = out_evt->info.imma.info.admInitRsp.error; ------------------------------------------------------------------------------ New Year. New Location. New Benefits. New Data Center in Ashburn, VA. GigeNET is offering a free month of service with a new server in Ashburn. Choose from 2 high performing configs, both with 100TB of bandwidth. Higher redundancy.Lower latency.Increased capacity.Completely compliant. http://p.sf.net/sfu/gigenet _______________________________________________ Opensaf-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/opensaf-devel
