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


If a component crash/exits during opensaf shutdown it will delay the shutdown
with the component configured callback timeout.

The reason is that the avadown event is ignored in the shutdown state. This
results in amfnd sends a terminate callback request to an already terminated
process.

This is fixed by handling the avadown event and launch the cleanup script for
the component. This changes the presence state to terminating thus the send of
the terminate request will be skipped.

diff --git a/osaf/services/saf/amf/amfnd/comp.cc 
b/osaf/services/saf/amf/amfnd/comp.cc
--- a/osaf/services/saf/amf/amfnd/comp.cc
+++ b/osaf/services/saf/amf/amfnd/comp.cc
@@ -366,12 +366,6 @@ uint32_t avnd_evt_mds_ava_dn_evh(AVND_CB
 
        TRACE_ENTER();
 
-       if (m_AVND_IS_SHUTTING_DOWN(cb)) {
-               /* AVA down should be ignored during SHUTTING DOWN and 
components should be cleaned up in order when 
-                  SUSI removal is done.*/
-               goto done;
-       }
-
        memset(&name, 0, sizeof(SaNameT));
 
        /* get the matching registered comp (if any) */
@@ -395,7 +389,7 @@ uint32_t avnd_evt_mds_ava_dn_evh(AVND_CB
 
        /* pg tracking may be started by this ava... delete those traces */
        avnd_pg_finalize(cb, 0, &mds_evt->mds_dest);
-done:
+
        TRACE_LEAVE();
        return rc;
 }

------------------------------------------------------------------------------
Android apps run on BlackBerry 10
Introducing the new BlackBerry 10.2.1 Runtime for Android apps.
Now with support for Jelly Bean, Bluetooth, Mapview and more.
Get your Android app in front of a whole new audience.  Start now.
http://pubads.g.doubleclick.net/gampad/clk?id=124407151&iu=/4140/ostg.clktrk
_______________________________________________
Opensaf-devel mailing list
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel

Reply via email to