osaf/services/saf/amf/amfnd/cbq.cc |  7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)


If a SI is in SHUTTING-down mode and a lock request arrives,
the component is required to call saAmfCSIQuiescingComplete() which
shouldn't be needed.

Therefore we should stop the qscing complete timer on
CSI removal.

diff --git a/osaf/services/saf/amf/amfnd/cbq.cc 
b/osaf/services/saf/amf/amfnd/cbq.cc
--- a/osaf/services/saf/amf/amfnd/cbq.cc
+++ b/osaf/services/saf/amf/amfnd/cbq.cc
@@ -483,6 +483,13 @@ uint32_t avnd_evt_ava_resp_evh(AVND_CB *
                        if (NCSCC_RC_SUCCESS != rc)
                                goto done;
                }
+
+               /*  cancel qscing_tmr in case this is this called
+               during an admin shutdown etc.. */
+               if (m_AVND_TMR_IS_ACTIVE(comp->qscing_tmr)) {
+                       m_AVND_TMR_COMP_QSCING_CMPL_STOP(cb, comp);
+               }
+
                break;
 
        case AVSV_AMF_PXIED_COMP_INST:

------------------------------------------------------------------------------
"Accelerate Dev Cycles with Automated Cross-Browser Testing - For FREE
Instantly run your Selenium tests across 300+ browser/OS combos.  Get 
unparalleled scalability from the best Selenium testing platform available.
Simple to use. Nothing to install. Get started now for free."
http://p.sf.net/sfu/SauceLabs
_______________________________________________
Opensaf-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel

Reply via email to