Hi Hung, Reviewed the code. Ack from me.
BR, Zoran -----Original Message----- From: Hung Nguyen [mailto:[email protected]] Sent: den 23 september 2016 09:49 To: Zoran Milinkovic <[email protected]>; [email protected] Cc: [email protected] Subject: [PATCH 1 of 1] imm: Do not send ccb abort reply to clients if they are not in CCB call [#2010] osaf/services/saf/immsv/immnd/ImmModel.cc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) If the ccb is in CCB_READY/CCB_VALIDATED/CCB_COMMITTED/CCB_ABORTED, the client is not invoking any ccb call. We do not send ccb abort reply to clients in that case. In case of timeout, it's already guarded by 'mPurged'. If ccb->mAugCcbParent is not null, the client must be in a CCB call, so we don't have to check for ccb state in that case. We always add 'ccb->mAugCcbParent->mOriginatingConn' in this case. 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 @@ -6299,7 +6299,7 @@ ImmModel::ccbAbort(SaUint32T ccbId, Conn } /* Only send response when ccb continuation is not purged */ - if (!ccb->mPurged) { + if (!ccb->mPurged && ccb->mState != IMM_CCB_READY && ccb->mState != + IMM_CCB_VALIDATED) { clVector.push_back(ccb->mOriginatingConn); *nodeId = ccb->mOriginatingNode; } ------------------------------------------------------------------------------ _______________________________________________ Opensaf-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/opensaf-devel
