connectivitymodules/SeCon/services/pcd/src/sconsbeclient.cpp
changeset 20 e1de7d03f843
parent 19 2691f6aa1921
child 36 9ba7f05d28a5
equal deleted inserted replaced
19:2691f6aa1921 20:e1de7d03f843
   519     
   519     
   520     for( TInt i = 0; i < dataOwners.Count(); i++ )
   520     for( TInt i = 0; i < dataOwners.Count(); i++ )
   521         {
   521         {
   522         LOGGER_WRITE_2("handling do: %d, count: %d", i, dataOwners.Count());
   522         LOGGER_WRITE_2("handling do: %d, count: %d", i, dataOwners.Count());
   523         CSConDataOwner* dataOwner = new (ELeave) CSConDataOwner();
   523         CSConDataOwner* dataOwner = new (ELeave) CSConDataOwner();
       
   524         CleanupStack::PushL( dataOwner );
   524         // default values
   525         // default values
   525         TSecureId sid( 0 );
   526         TSecureId sid( 0 );
   526         includeToList = ETrue;
   527         includeToList = ETrue;
   527         
   528         
   528         TCommonBURSettings commonOptions = dataOwners[i]->CommonSettings();
   529         TCommonBURSettings commonOptions = dataOwners[i]->CommonSettings();
   702             }
   703             }
   703         
   704         
   704         if( includeToList ) 
   705         if( includeToList ) 
   705             {
   706             {
   706             LOGGER_WRITE_1( "Appending to list, uid: 0x%08x", dataOwner->iUid.iUid );
   707             LOGGER_WRITE_1( "Appending to list, uid: 0x%08x", dataOwner->iUid.iUid );
   707             iCurrentTask->iListDataOwnersParams->iDataOwners.Append( dataOwner );
   708             iCurrentTask->iListDataOwnersParams->iDataOwners.AppendL( dataOwner );
       
   709             CleanupStack::Pop( dataOwner );
   708             }
   710             }
   709         
   711         
   710         if( sid )
   712         if( sid )
   711             {
   713             {
   712             LOGGER_WRITE_1( "Appending package sid to list, sid: 0x%08x", sid.iId );
   714             LOGGER_WRITE_1( "Appending package sid to list, sid: 0x%08x", sid.iId );
   713             CSConDataOwner* packageDataOwner = dataOwner->CopyL();
   715             CSConDataOwner* packageDataOwner = dataOwner->CopyL();
       
   716             CleanupStack::PushL( packageDataOwner );
   714             //Clear package name
   717             //Clear package name
   715             packageDataOwner->iPackageName = KNullDesC();
   718             packageDataOwner->iPackageName = KNullDesC();
   716             //Add sid
   719             //Add sid
   717             packageDataOwner->iUid.iUid = sid.iId;
   720             packageDataOwner->iUid.iUid = sid.iId;
   718             iCurrentTask->iListDataOwnersParams->iDataOwners.Append( packageDataOwner );
   721             iCurrentTask->iListDataOwnersParams->iDataOwners.AppendL( packageDataOwner );
       
   722             CleanupStack::PopAndDestroy( packageDataOwner );
   719             }
   723             }
   720         
   724         
   721         if( !includeToList )
   725         if( !includeToList )
   722             {
   726             {
   723             //Not included to list => delete memory allocation
   727             //Not included to list => delete memory allocation
   724             delete dataOwner;
   728             CleanupStack::PopAndDestroy( dataOwner );
   725             }
   729             }
   726         }
   730         }
   727         
   731         
   728     packageArray.Reset();
   732     packageArray.Reset();
   729     CleanupStack::PopAndDestroy( &packageArray );
   733     CleanupStack::PopAndDestroy( &packageArray );