Hi Hung, Ack from me.
Thanks, Zoran -----Original Message----- From: Hung Nguyen [mailto:[email protected]] Sent: den 25 november 2016 08:35 To: Zoran Milinkovic <[email protected]>; [email protected] Cc: [email protected] Subject: [PATCH 1 of 1] imm: Correct nodeId assertion in ImmModel::ccbAbort() [#2205] osaf/services/saf/immsv/immnd/ImmModel.cc | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) Correct nodeId assertion in ImmModel::ccbAbort(). 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 @@ -6323,7 +6323,8 @@ ImmModel::ccbAbort(SaUint32T ccbId, Conn } if(ccb->mAugCcbParent && ccb->mAugCcbParent->mOriginatingConn) { - if(ccb->mOriginatingConn && !ccb->mPurged) { + if(ccb->mOriginatingConn && !ccb->mPurged && ccb->mState != IMM_CCB_EMPTY + && ccb->mState != IMM_CCB_READY && ccb->mState != IMM_CCB_VALIDATED) { /* Case where augumented client and Augumented parent are originated from ths node. Send the client response to both clients. */ @@ -6333,7 +6334,9 @@ ImmModel::ccbAbort(SaUint32T ccbId, Conn and Augumented parent is originated from this node. Send the response to the Augumented parent. */ *nodeId = ccb->mAugCcbParent->mOriginatingNode; - clVector.pop_back(); + if (!clVector.empty()) { + clVector.pop_back(); + } } clVector.push_back(ccb->mAugCcbParent->mOriginatingConn); } ------------------------------------------------------------------------------ _______________________________________________ Opensaf-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/opensaf-devel
