osaf/libs/agents/saf/imma/imma_oi_api.c | 3 ++- osaf/services/saf/immsv/README | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/osaf/libs/agents/saf/imma/imma_oi_api.c b/osaf/libs/agents/saf/imma/imma_oi_api.c --- a/osaf/libs/agents/saf/imma/imma_oi_api.c +++ b/osaf/libs/agents/saf/imma/imma_oi_api.c @@ -3587,7 +3587,8 @@ getAdmoName(SaImmHandleT privateOmHandle } else { /* modify or delete => fetch admo attribute for object from server. */ if((cbi->type != IMMA_CALLBACK_OI_CCB_DELETE) && - (cbi->type != IMMA_CALLBACK_OI_CCB_MODIFY)) { + (cbi->type != IMMA_CALLBACK_OI_CCB_MODIFY) && + (cbi->type != IMMA_CALLBACK_OI_CCB_COMPLETED)) { LOG_ER("Inconsistency in callback type:%u", cbi->type); abort(); } diff --git a/osaf/services/saf/immsv/README b/osaf/services/saf/immsv/README --- a/osaf/services/saf/immsv/README +++ b/osaf/services/saf/immsv/README @@ -2727,6 +2727,12 @@ The API works exactly the same way as sa e) Safe read is not allowed using a runtime object as target. + f) saImmOiAugmentCcbInitialize is allowed in completed callback, but it should be + mainly used for calling saImmOmCcbObjectRead. After saImmOiAugmentCcbInitialize + succeeds object create/delete/modify will not be called because ccb will not + be in the state to execute the operations and ccb will be marked as abort. + After calling saImmOmCcbObjectRead, the augumentaion should be finalized. + Runtime attributes residing in a config object are handled exactly the same as for saImmOmAccessorGet. The reason a safe-read call is not allowed on a runtime *object* is that a runtime object *only* contains runtime attributes. Performing a safe-read ------------------------------------------------------------------------------ _______________________________________________ Opensaf-devel mailing list Opensaf-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/opensaf-devel