osaf/services/saf/smfsv/smfd/SmfImmOperation.cc | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
For campaign IMM CCB delete operations, SMF does now read object data to create
rollback information before the IMM CCB delete operation.
The fault was detected when Ticket #426 was introduced.
diff --git a/osaf/services/saf/smfsv/smfd/SmfImmOperation.cc
b/osaf/services/saf/smfsv/smfd/SmfImmOperation.cc
--- a/osaf/services/saf/smfsv/smfd/SmfImmOperation.cc
+++ b/osaf/services/saf/smfsv/smfd/SmfImmOperation.cc
@@ -652,13 +652,6 @@ SmfImmDeleteOperation::execute(SmfRollba
return result;
}
- result = immutil_saImmOmCcbObjectDelete(m_ccbHandle, &objectName);
- if (result != SA_AIS_OK) {
- LOG_NO("SmfImmDeleteOperation::execute,
immutil_saImmOmCcbObjectDelete failed rc=%s (child objects maybe exists)",
saf_error(result));
- TRACE_LEAVE();
- return result;
- }
-
if (o_rollbackData != NULL) {
if ((result = this->prepareRollback(o_rollbackData)) !=
SA_AIS_OK) {
LOG_NO("SmfImmDeleteOperation::execute, failed to
prepare rollback data rc=%s", saf_error(result));
@@ -667,6 +660,13 @@ SmfImmDeleteOperation::execute(SmfRollba
}
}
+ result = immutil_saImmOmCcbObjectDelete(m_ccbHandle, &objectName);
+ if (result != SA_AIS_OK) {
+ LOG_NO("SmfImmDeleteOperation::execute,
immutil_saImmOmCcbObjectDelete failed rc=%s (child objects maybe exists)",
saf_error(result));
+ TRACE_LEAVE();
+ return result;
+ }
+
//Release IMM ownership
//This is not needed when saImmOmAdminOwnerInitialize
"releaseOwnershipOnFinalize" is set to true
//The ownership will be automatically released at
saImmOmAdminOwnerFinalize
------------------------------------------------------------------------------
_______________________________________________
Opensaf-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
