osaf/services/saf/amf/amfd/role.cc |  10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)


diff --git a/osaf/services/saf/amf/amfd/role.cc 
b/osaf/services/saf/amf/amfd/role.cc
--- a/osaf/services/saf/amf/amfd/role.cc
+++ b/osaf/services/saf/amf/amfd/role.cc
@@ -591,26 +591,30 @@ static void reset_admin_op_params_after_
         while (NULL != (node = avd_node_getnext_nodeid(node_id))) {
                node->admin_node_pend_cbk.invocation = 0;
                node->admin_node_pend_cbk.admin_oper = 
static_cast<SaAmfAdminOperationIdT>(0);
+               node_id = node->node_info.nodeId;
        }
        //For SI.
        AVD_SI *si;
        dn.length = 0;
-       for (si = avd_si_getnext(&dn); si != NULL; si = avd_si_getnext(&dn))
+       for (si = avd_si_getnext(&dn); si != NULL; si = avd_si_getnext(&dn)) {
                si->invocation = 0;
+               dn = si->name;
+       }
        //For SG.
        AVD_SG *sg = NULL;
         dn.length = 0;
         for (sg = avd_sg_getnext(&dn); sg != NULL; sg = avd_sg_getnext(&dn)) {
                sg->adminOp_invocationId = 0;
                sg->adminOp = static_cast<SaAmfAdminOperationIdT>(0);
+               dn = sg->name;
        }
        //For SU.
        AVD_SU *su;
        dn.length = 0;
        for (su = avd_su_getnext(&dn); su != NULL; su = avd_su_getnext(&dn)) {
                su->pend_cbk.invocation = 0;
-                su->pend_cbk.admin_oper = 
static_cast<SaAmfAdminOperationIdT>(0);
-
+               su->pend_cbk.admin_oper = 
static_cast<SaAmfAdminOperationIdT>(0);
+               dn = su->name;
        }
        TRACE_LEAVE();
 }

------------------------------------------------------------------------------
Dive into the World of Parallel Programming The Go Parallel Website, sponsored
by Intel and developed in partnership with Slashdot Media, is your hub for all
things parallel software development, from weekly thought leadership blogs to
news, videos, case studies, tutorials and more. Take a look and join the 
conversation now. http://goparallel.sourceforge.net/
_______________________________________________
Opensaf-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel

Reply via email to