Ack. Can you please push it now? Thanks -Nagu
> -----Original Message----- > From: Hans Feldt [mailto:[email protected]] > Sent: 14 February 2014 03:24 > To: Praveen Malviya > Cc: [email protected] > Subject: [devel] [PATCH 1 of 1] amfnd: init clc attrs after category [#782] > > osaf/services/saf/amf/amfnd/compdb.cc | 3 +-- > 1 files changed, 1 insertions(+), 2 deletions(-) > > > Sometimes SU LOCK-IN fails with timeout on callback. > > Reason is that callback timeout value was initialized too early resulting in > a zero > value. > > A code line is moved to allow comp category initialization before attributes > are > initialized. > > diff --git a/osaf/services/saf/amf/amfnd/compdb.cc > b/osaf/services/saf/amf/amfnd/compdb.cc > --- a/osaf/services/saf/amf/amfnd/compdb.cc > +++ b/osaf/services/saf/amf/amfnd/compdb.cc > @@ -1383,8 +1383,6 @@ static int comp_init(AVND_COMP *comp, co > > const_cast<SaImmAttrNameT>("saAmfNodeSwBundlePathPrefix"), > &nodeswbundle_name, &path_prefix); > > - init_clc_cli_attributes(comp, comptype, path_prefix, attributes); > - > if > (immutil_getAttr(const_cast<SaImmAttrNameT>("saAmfCompInstantiationLeve > l"), attributes, 0, &comp->inst_level) != SA_AIS_OK) > comp->inst_level = comptype->saAmfCtDefInstantiationLevel; > > @@ -1439,6 +1437,7 @@ static int comp_init(AVND_COMP *comp, co > comp->is_restart_en = (disable_restart == SA_TRUE) ? false : true; > > init_comp_category(comp, comptype->saAmfCtCompCategory); > + init_clc_cli_attributes(comp, comptype, path_prefix, attributes); > > if (m_AVND_COMP_TYPE_IS_PREINSTANTIABLE(comp)) > m_AVND_COMP_OPER_STATE_SET(comp, > SA_AMF_OPERATIONAL_DISABLED); > > ------------------------------------------------------------------------------ > 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.clk > trk > _______________________________________________ > Opensaf-devel mailing list > [email protected] > https://lists.sourceforge.net/lists/listinfo/opensaf-devel ------------------------------------------------------------------------------ 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 [email protected] https://lists.sourceforge.net/lists/listinfo/opensaf-devel
