Hi Neel, Reviewed and tested the patch. Ack from me.
A minor comment that the comment should be change to /* Check if canonicalizedAttrMod is already built */ instead of /* Must already be built for primary pbe */ BR, Hung Nguyen - DEK Technologies -------------------------------------------------------------------------------- From: Neelakanta Reddy [email protected] Sent: Tuesday, April 05, 2016 8:12PM To: Zoran Milinkovic [email protected] Cc: Opensaf-devel [email protected] Subject: [devel] [PATCH 1 of 1] imm: Remove the assertion when object is modified with 2PBE [#1716] osaf/services/saf/immsv/immnd/immnd_evt.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) 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 @@ -6559,7 +6559,9 @@ static void immnd_evt_proc_object_modify oi_cl_node->version.majorVersion == 0x2 && oi_cl_node->version.releaseCode == 'A') { if (applConnArr[ix] == pbeApplierConn) { /* Slave pbe */ - osafassert(canonicalizedAttrMod); /* Must already be built for primary pbe */ + if(!canonicalizedAttrMod) { /* Must already be built for primary pbe */ + canonicalizedAttrMod = immModel_canonicalizeAttrModification(cb, &(evt->info.objModify)); + } send_evt.info.imma.info.objModify.attrMods = canonicalizedAttrMod; } else { if (!allWritableAttr) { /* Check if allWritableAttr is already built */ ------------------------------------------------------------------------------ _______________________________________________ Opensaf-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/opensaf-devel ------------------------------------------------------------------------------ _______________________________________________ Opensaf-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/opensaf-devel
