[devel] [PATCH 1 of 1] IMM: saImmOmCcbValidate must cancel ccb-timer before returning [#1201]

[Anders B. <and...@er...>]

 osaf/services/saf/immsv/immnd/ImmModel.cc |  1 +
 1 files changed, 1 insertions(+), 0 deletions(-)


saImmOmCcbValidate retuurned without canceling the ccb-oi-timer resulting
in the potential abort of the ccb due to timeout when the om-user is
idling, between saImmOmCcbValidate and the termination of the ccb.
The ccb can be terminated by either saImmOmCcbApply or saimmOmCcbAbort.
In the timeout case, the saImmOmCcbApply will return ERR_FAILED_OPERATION
signidying the ccb was aborted, even if validation succeeded.

This patch fixes so that the timer is canceled before returning to the
om-user from saImmOmCcbValidate.

diff --git a/osaf/services/saf/immsv/immnd/ImmModel.cc b/osaf/services/saf/immsv/immnd/ImmModel.cc
--- a/osaf/services/saf/immsv/immnd/ImmModel.cc
+++ b/osaf/services/saf/immsv/immnd/ImmModel.cc
@@ -9259,6 +9259,7 @@ ImmModel::ccbWaitForCompletedAck(SaUint3
             *err = SA_AIS_ERR_INTERRUPT;
         }
 
+        ccb->mWaitStartTime = 0;
         return false;
     }