Ack from me.
Not tested.
/AndersBj
On 09/09/2015 07:01 PM, Hung Nguyen wrote:
> osaf/services/saf/immsv/immnd/ImmModel.cc | 12 ++----------
> 1 files changed, 2 insertions(+), 10 deletions(-)
>
>
> Don't assign default values to empty valued attributes when sync.
> This fix is for both CONFIG and RUNTIME objects.
>
> diff --git a/osaf/services/saf/immsv/immnd/ImmModel.cc
> b/osaf/services/saf/immsv/immnd/ImmModel.cc
> --- a/osaf/services/saf/immsv/immnd/ImmModel.cc
> +++ b/osaf/services/saf/immsv/immnd/ImmModel.cc
> @@ -16180,17 +16180,9 @@ ImmModel::objectSync(const ImmsvOmObject
>
> ImmAttrValue* attrValue = NULL;
> if(attr->mFlags & SA_IMM_ATTR_MULTI_VALUE) {
> - if(attr->mDefaultValue.empty()) {
> - attrValue = new ImmAttrMultiValue();
> - } else {
> - attrValue = new ImmAttrMultiValue(attr->mDefaultValue);
> - }
> + attrValue = new ImmAttrMultiValue();
> } else {
> - if(attr->mDefaultValue.empty()) {
> - attrValue = new ImmAttrValue();
> - } else {
> - attrValue = new ImmAttrValue(attr->mDefaultValue);
> - }
> + attrValue = new ImmAttrValue();
> }
>
> //Set admin owner as a regular attribute and then also a pointer
------------------------------------------------------------------------------
_______________________________________________
Opensaf-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
