osaf/services/saf/smfsv/smfd/SmfUpgradeProcedure.cc | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/osaf/services/saf/smfsv/smfd/SmfUpgradeProcedure.cc
b/osaf/services/saf/smfsv/smfd/SmfUpgradeProcedure.cc
--- a/osaf/services/saf/smfsv/smfd/SmfUpgradeProcedure.cc
+++ b/osaf/services/saf/smfsv/smfd/SmfUpgradeProcedure.cc
@@ -4247,7 +4247,6 @@ SmfSwapThread::main(void)
int rc = admOp.execute(0);
while ((rc == SA_AIS_ERR_TRY_AGAIN) ||
(rc == SA_AIS_ERR_BUSY) ||
- (rc == SA_AIS_ERR_TIMEOUT) ||
(rc == SA_AIS_ERR_FAILED_OPERATION)) {
if (retryCnt > max_swap_retry) {
@@ -4255,8 +4254,7 @@ SmfSwapThread::main(void)
goto exit_error;
}
- if ((rc == SA_AIS_ERR_TIMEOUT) ||
- (rc == SA_AIS_ERR_FAILED_OPERATION)) {
+ if (rc == SA_AIS_ERR_FAILED_OPERATION) {
//A timeout or failed operation occur. It is undefined
if the operation was successful or not.
//We wait for maximum two minutes to see if the
campaign thread is terminated (which it is in a successful swap)
//If not terminated, retry the SWAP operation.
------------------------------------------------------------------------------
_______________________________________________
Opensaf-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
