changeset: 4970:19ec12c937f4
branch: opensaf-4.4.x
parent: 4968:c4b12097b48b
user: Hans Feldt <[email protected]>
date: Fri Feb 14 08:02:04 2014 +0100
summary: amfnd: init clc attrs after category [#782]
changeset: 4971:70a608b7c6ac
tag: tip
parent: 4969:215055a5f7fa
user: Hans Feldt <[email protected]>
date: Fri Feb 14 08:02:04 2014 +0100
summary: amfnd: init clc attrs after category [#782]
---
** [tickets:#782] amfnd: bug initializing callback timeout**
**Status:** review
**Created:** Thu Feb 13, 2014 08:20 PM UTC by Hans Feldt
**Last Updated:** Thu Feb 13, 2014 08:38 PM UTC
**Owner:** Hans Feldt
This is a regression introduced in #662
comp callback timeouts are initialized before the component category has been
initialized resulting in 0 rmv callback timeout, patch:
~~~~~~
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>("saAmfCompInstantiationLevel"),
attributes, 0, &comp->inst_level) != SA_AIS_OK)
comp->inst_level = comptype->saAmfCtDefInstantiationLevel;
@@ -1440,6 +1438,8 @@ static int comp_init(AVND_COMP *comp, co
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);
else
~~~~~~
---
Sent from sourceforge.net because [email protected] is
subscribed to https://sourceforge.net/p/opensaf/tickets/
To unsubscribe from further messages, a project admin can change settings at
https://sourceforge.net/p/opensaf/admin/tickets/options. Or, if this is a
mailing list, you can unsubscribe from the mailing list.------------------------------------------------------------------------------
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-tickets mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-tickets
