osaf/services/saf/amf/amfd/su.cc |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)


Standby AMF crashes while adding SU in its database.

This got introduced in changeset 5166 {#713]. The problem is standby AMFD is 
inserting
a SU in su_db which has already been created in MBCSV checkpointing.

Avoid adding SU in SU databse if it already exists.

diff --git a/osaf/services/saf/amf/amfd/su.cc b/osaf/services/saf/amf/amfd/su.cc
--- a/osaf/services/saf/amf/amfd/su.cc
+++ b/osaf/services/saf/amf/amfd/su.cc
@@ -598,8 +598,10 @@ static void su_add_to_model(AVD_SU *su)
        su->sg_of_su = avd_sg_get(&dn);
        osafassert(su->sg_of_su);
 
-       rc = su_db->insert(su);
-       osafassert(rc == NCSCC_RC_SUCCESS);
+       if (su_db->find(&su->name) == NULL) {
+               rc = su_db->insert(su);
+               osafassert(rc == NCSCC_RC_SUCCESS);
+       }
        su->su_type = avd_sutype_get(&su->saAmfSUType);
        osafassert(su->su_type);
        avd_sutype_add_su(su);

------------------------------------------------------------------------------
Time is money. Stop wasting it! Get your web API in 5 minutes.
www.restlet.com/download
http://p.sf.net/sfu/restlet
_______________________________________________
Opensaf-devel mailing list
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel

Reply via email to