src/imm/agent/imma_om_api.cc | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/src/imm/agent/imma_om_api.cc b/src/imm/agent/imma_om_api.cc
--- a/src/imm/agent/imma_om_api.cc
+++ b/src/imm/agent/imma_om_api.cc
@@ -1528,7 +1528,6 @@ SaAisErrorT saImmOmCcbInitialize(SaImmAd
rc = imma_newCcbId(cb, ccb_node, adminOwnerId, &locked,
cl_node->syncr_timeout);
cl_node=NULL;
- if(rc == SA_AIS_ERR_LIBRARY) {goto done;}
/* ccb_node still valid if rc == SA_AIS_OK. */
if(rc == SA_AIS_OK) {
osafassert(!(ccb_node->mExclusive));
@@ -1554,6 +1553,7 @@ SaAisErrorT saImmOmCcbInitialize(SaImmAd
}
imma_proc_decrement_pending_reply(cl_node, true);
+ if(rc == SA_AIS_ERR_LIBRARY) {goto done;}
if (cl_node->stale) {
if (isExposed(cb, cl_node)) {
@@ -1817,7 +1817,6 @@ static SaAisErrorT ccb_object_create_com
}
rc = imma_newCcbId(cb, ccb_node, adminOwnerId, &locked,
cl_node->syncr_timeout);
cl_node = NULL;
- if(rc == SA_AIS_ERR_LIBRARY) {goto done;}
/* ccb_node still valid if rc == SA_AIS_OK. */
if(rc == SA_AIS_OK) {
osafassert(!(ccb_node->mExclusive));
@@ -2412,7 +2411,6 @@ static SaAisErrorT ccb_object_modify_com
}
rc = imma_newCcbId(cb, ccb_node, adminOwnerId, &locked,
cl_node->syncr_timeout);
cl_node = NULL;
- if(rc == SA_AIS_ERR_LIBRARY) {goto done;}
/* ccb_node still valid if rc == SA_AIS_OK. */
if(rc == SA_AIS_OK) {
osafassert(!(ccb_node->mExclusive));
@@ -2895,7 +2893,6 @@ static SaAisErrorT ccb_object_delete_com
}
rc = imma_newCcbId(cb, ccb_node, adminOwnerId, &locked,
cl_node->syncr_timeout);
cl_node = NULL;
- if(rc == SA_AIS_ERR_LIBRARY) {goto done;}
/* ccb_node still valid if rc == SA_AIS_OK. */
if(rc == SA_AIS_OK) {
osafassert(!(ccb_node->mExclusive));
@@ -6521,7 +6518,6 @@ SaAisErrorT saImmOmCcbObjectRead(SaImmCc
}
rc = imma_newCcbId(cb, ccb_node, adminOwnerId, &locked,
cl_node->syncr_timeout);
cl_node = NULL;
- if(rc == SA_AIS_ERR_LIBRARY) {goto done;}
/* ccb_node still valid if rc == SA_AIS_OK. */
if(rc == SA_AIS_OK) {
osafassert(!(ccb_node->mExclusive));
@@ -9191,7 +9187,6 @@ static SaAisErrorT imma_finalizeCcb(SaIm
rc = imma_newCcbId(cb, ccb_node, adminOwnerId, &locked,
cl_node->syncr_timeout);
cl_node=NULL;
- if(rc != SA_AIS_OK) {goto done;}
/* ccb_node still valid if rc == SA_AIS_OK. */
if(rc == SA_AIS_OK) {
osafassert(!(ccb_node->mExclusive));
@@ -9212,6 +9207,7 @@ static SaAisErrorT imma_finalizeCcb(SaIm
/* Dont care if cl_node is stale here. This will be
caught
in the next attempt to use the related handle(s).
*/
+ if(rc != SA_AIS_OK) {goto done;}
}
}
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Opensaf-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
