Reviewed it. Ack
/Rafael
On 10/29/2015 01:15 PM, Ingvar Bergstrom wrote:
> osaf/services/saf/smfsv/smfd/SmfUpgradeProcedure.cc | 22
> +++++++++-----------
> 1 files changed, 10 insertions(+), 12 deletions(-)
>
>
> When procedure merge to One Step is activated, smfd shall detect if
> an AU is in scpe of an already existing AU. e.g. if a component is
> in scope of a Node.
> This patch correct it for procedures addressing component level.
>
> diff --git a/osaf/services/saf/smfsv/smfd/SmfUpgradeProcedure.cc
> b/osaf/services/saf/smfsv/smfd/SmfUpgradeProcedure.cc
> --- a/osaf/services/saf/smfsv/smfd/SmfUpgradeProcedure.cc
> +++ b/osaf/services/saf/smfsv/smfd/SmfUpgradeProcedure.cc
> @@ -1302,18 +1302,16 @@ SmfUpgradeProcedure::mergeStepIntoSingle
> //For all comp/SU sound in the scope of the node.
> //Find out if any remaininf DU is within it
> for (unit_iter = tmpDU.begin(); unit_iter !=
> tmpDU.end();) {
> - if ((*unit_iter).name.find("safSu=") == 0)
> {//SU as AU/DU
> - if ((*unit_iter).name ==
> (*iter).second.suDN) { //Check SU
> - LOG_NO("[%s] is in scope of
> [%s], remove it from DU list",
> -
> (*unit_iter).name.c_str(), (*node_iter).name.c_str());
> - unit_iter =
> tmpDU.erase(unit_iter); //Remove the node and update iterator
> - } else if ((*unit_iter).name ==
> (*iter).second.compDN) { //Check comp
> - LOG_NO("[%s] is in scope of
> [%s], remove it from DU list",
> -
> (*unit_iter).name.c_str(), (*node_iter).name.c_str());
> - unit_iter =
> tmpDU.erase(unit_iter); //Remove the node and update iterator
> - } else {
> - unit_iter++;
> - }
> + if ((*unit_iter).name == (*iter).second.suDN) {
> //Check SU
> + LOG_NO("[%s] is in scope of [%s],
> remove it from DU list",
> + (*unit_iter).name.c_str(),
> (*node_iter).name.c_str());
> + unit_iter = tmpDU.erase(unit_iter);
> //Remove the node and update iterator
> + } else if ((*unit_iter).name ==
> (*iter).second.compDN) { //Check comp
> + LOG_NO("[%s] is in scope of [%s],
> remove it from DU list",
> + (*unit_iter).name.c_str(),
> (*node_iter).name.c_str());
> + unit_iter = tmpDU.erase(unit_iter);
> //Remove the node and update iterator
> + } else {
> + unit_iter++;
> }
> }
> }
------------------------------------------------------------------------------
_______________________________________________
Opensaf-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
