Ack, code review only/Regards HansN
-----Original Message-----
From: [email protected] [mailto:[email protected]]
Sent: den 14 augusti 2014 12:50
To: Hans Feldt; Hans Nordebäck; [email protected]
Cc: [email protected]
Subject: [PATCH 1 of 1] amfd: respond to IMM during SI unlock op [#985]
osaf/services/saf/amf/amfd/si.cc | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
If Si remains unassigned, then Amfd is not responding to IMM.
It should respond with success.
diff --git a/osaf/services/saf/amf/amfd/si.cc b/osaf/services/saf/amf/amfd/si.cc
--- a/osaf/services/saf/amf/amfd/si.cc
+++ b/osaf/services/saf/amf/amfd/si.cc
@@ -818,8 +818,12 @@ static void si_admin_op_cb(SaImmOiHandle
si->set_admin_state(SA_AMF_ADMIN_UNLOCKED);
err = si->sg_of_si->si_assign(avd_cb, si);
- if (si->list_of_sisu == NULL)
+ if (si->list_of_sisu == NULL) {
LOG_NO("'%s' could not be assigned to any SU",
si->name.value);
+ rc = SA_AIS_OK;
+ avd_saImmOiAdminOperationResult(immOiHandle,
invocation, rc);
+ goto done;
+ }
if (err != NCSCC_RC_SUCCESS) {
report_admin_op_error(immOiHandle, invocation,
SA_AIS_ERR_BAD_OPERATION, NULL,
------------------------------------------------------------------------------
_______________________________________________
Opensaf-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
