osaf/services/saf/smfsv/smfd/SmfCampaignXmlParser.cc | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
Parsing of parent and type combinations in activationUnitTemplate fixed.
The combinations which was fixed are the combinations where a type followed by
a parent.
That problem affected the rolling SU from parent and type cases.
diff --git a/osaf/services/saf/smfsv/smfd/SmfCampaignXmlParser.cc
b/osaf/services/saf/smfsv/smfd/SmfCampaignXmlParser.cc
--- a/osaf/services/saf/smfsv/smfd/SmfCampaignXmlParser.cc
+++ b/osaf/services/saf/smfsv/smfd/SmfCampaignXmlParser.cc
@@ -843,13 +843,14 @@ SmfCampaignXmlParser::parseParentTypeEle
if ((!strcmp((char *)cur->name, "parent")) && (cur->ns == ns))
//Fetch parent/type pair
{
TRACE("xmlTag parent found");
- if ( parentFound == true ) { //Two parent tag was in
sequence
+ if (parentFound || typeFound) { //Two parent tag was
in sequence or type followed by parent
io_templ->addActivationUnitTemplate(pt);
//Save the previous found parent
}
pt = new(std::nothrow) SmfParentType; //Create a
new parent/type pair for the new parent
osafassert(pt != NULL);
parentFound = true;
+ typeFound = false;
if ((s = (char *)xmlGetProp(cur, (const xmlChar
*)"objectDN"))) {
TRACE("objectDN = %s\n", s);
------------------------------------------------------------------------------
New Year. New Location. New Benefits. New Data Center in Ashburn, VA.
GigeNET is offering a free month of service with a new server in Ashburn.
Choose from 2 high performing configs, both with 100TB of bandwidth.
Higher redundancy.Lower latency.Increased capacity.Completely compliant.
vanity: www.gigenet.com
_______________________________________________
Opensaf-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
