Ack.

Thanks
Praveen
On 16-Dec-13 12:07 PM, [email protected] wrote:
>   osaf/services/saf/amf/amfd/si.cc |  11 ++++++-----
>   1 files changed, 6 insertions(+), 5 deletions(-)
>
>
> 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
> @@ -796,11 +796,11 @@ static void si_admin_op_cb(SaImmOiHandle
>           }
>   
>           /* Avoid if any single Csi assignment is undergoing on SG. */
> -        if (csi_assignment_validate(si->sg_of_si) == true) {
> -                rc = SA_AIS_ERR_TRY_AGAIN;
> -                LOG_WA("Single Csi assignment undergoing on (sg'%s')", 
> si->sg_of_si->name.value);
> -                goto done;
> -        }
> +     if (csi_assignment_validate(si->sg_of_si) == true) {
> +             report_admin_op_error(immOiHandle, invocation, 
> SA_AIS_ERR_TRY_AGAIN, NULL,
> +                             "Single Csi assignment undergoing on (sg'%s')", 
> si->sg_of_si->name.value);
> +             goto done;
> +     }
>   
>       switch (operationId) {
>       case SA_AMF_ADMIN_UNLOCK:
> @@ -860,6 +860,7 @@ static void si_admin_op_cb(SaImmOiHandle
>                       /* This may happen when SUs are locked before SI is 
> locked. */
>                       LOG_WA("SI lock of %s, has no assignments", 
> objectName->value);
>                       rc = SA_AIS_OK;
> +                     avd_saImmOiAdminOperationResult(immOiHandle, 
> invocation, rc);
>                       goto done;
>               }
>   


------------------------------------------------------------------------------
WatchGuard Dimension instantly turns raw network data into actionable 
security intelligence. It gives you real-time visual feedback on key
security issues and trends.  Skip the complicated setup - simply import
a virtual appliance and go from zero to informed in seconds.
http://pubads.g.doubleclick.net/gampad/clk?id=123612991&iu=/4140/ostg.clktrk
_______________________________________________
Opensaf-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel

Reply via email to