equal
deleted
inserted
replaced
3692 !APExistsL( apId ) ) |
3692 !APExistsL( apId ) ) |
3693 { |
3693 { |
3694 if ( aLUID.Length() > 0 ) |
3694 if ( aLUID.Length() > 0 ) |
3695 { |
3695 { |
3696 // Stale data, remove mapping. |
3696 // Stale data, remove mapping. |
3697 RNSmlDMCallbackSession dMCbSession; |
3697 TInt ret = iCallBack->RemoveMappingL( KNSmlInternetAdapterImplUid, |
3698 User::LeaveIfError( dMCbSession.Connect() ); |
3698 GetDynamicAPNodeUri( aURI ), ETrue ); |
3699 CleanupClosePushL( dMCbSession ); |
|
3700 |
|
3701 dMCbSession.RemoveMappingInfoL( KNSmlInternetAdapterImplUid, GetDynamicAPNodeUri( aURI ), ETrue ); |
|
3702 CleanupStack::PopAndDestroy( &dMCbSession ); |
|
3703 } |
3699 } |
3704 |
3700 |
3705 iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound ); |
3701 iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::ENotFound ); |
3706 CleanupStack::PopAndDestroy(); // currentURISegmentList |
3702 CleanupStack::PopAndDestroy(); // currentURISegmentList |
3707 _DBG_FILE("CNSmlInternetAdapter::ChildURIListL(): AP doesn't exist: ENotFound end"); |
3703 _DBG_FILE("CNSmlInternetAdapter::ChildURIListL(): AP doesn't exist: ENotFound end"); |
4835 // Check the name |
4831 // Check the name |
4836 TBuf8<KCommsDbSvrMaxFieldLength> name; |
4832 TBuf8<KCommsDbSvrMaxFieldLength> name; |
4837 tableView->ReadTextL( TPtrC(COMMDB_NAME ), name); |
4833 tableView->ReadTextL( TPtrC(COMMDB_NAME ), name); |
4838 if ( name.Compare( aObject ) != 0 ) |
4834 if ( name.Compare( aObject ) != 0 ) |
4839 { |
4835 { |
4840 // Not correct name |
4836 // Not correct name |
4841 RNSmlDMCallbackSession dMCbSession; |
|
4842 User::LeaveIfError( dMCbSession.Connect() ); |
|
4843 CleanupClosePushL( dMCbSession ); |
|
4844 |
|
4845 // Remove all mappings from AP/xxx level |
4837 // Remove all mappings from AP/xxx level |
4846 dMCbSession.RemoveMappingInfoL( KNSmlInternetAdapterImplUid, GetDynamicAPNodeUri( aURI ), ETrue ); |
4838 TInt ret = iCallBack->RemoveMappingL( KNSmlInternetAdapterImplUid, |
4847 CleanupStack::PopAndDestroy( &dMCbSession ); |
4839 GetDynamicAPNodeUri( aURI ) , ETrue ); |
4848 |
|
4849 iPrevURI->Des().Format( KNullDesC8 ); |
4840 iPrevURI->Des().Format( KNullDesC8 ); |
4850 iPrevLUID = 0; |
4841 iPrevLUID = 0; |
4851 } |
4842 } |
4852 else |
4843 else |
4853 { |
4844 { |
4903 |
4894 |
4904 if( parentLUID.Length() > 0 && IntLUID(parentLUID) > 0 && |
4895 if( parentLUID.Length() > 0 && IntLUID(parentLUID) > 0 && |
4905 !APExistsL( apId ) ) |
4896 !APExistsL( apId ) ) |
4906 { |
4897 { |
4907 // AP has been deleted. Handle as new data. |
4898 // AP has been deleted. Handle as new data. |
4908 _DBG_FILE("CNSmlInternetAdapter::AddNodeObjectL(): parentLUID.Length() > 0 && !APExistsL() -> Remove mapping "); |
4899 _DBG_FILE("CNSmlInternetAdapter::AddNodeObjectL(): parentLUID.Length() > 0 && !APExistsL() -> Remove mapping "); |
4909 |
4900 TInt ret = iCallBack->RemoveMappingL( KNSmlInternetAdapterImplUid, |
4910 RNSmlDMCallbackSession dMCbSession; |
4901 GetDynamicAPNodeUri( aURI ) , ETrue ); |
4911 User::LeaveIfError( dMCbSession.Connect() ); |
4902 if(ret) |
4912 CleanupClosePushL( dMCbSession ); |
4903 { |
4913 |
4904 iCallBack->SetStatusL( aStatusRef, CSmlDmAdapter::EError ); |
4914 // Remove all mappings from AP/xxx level |
4905 return; |
4915 dMCbSession.RemoveMappingInfoL( KNSmlInternetAdapterImplUid, GetDynamicAPNodeUri( aURI ), ETrue ); |
4906 } |
4916 CleanupStack::PopAndDestroy( &dMCbSession ); |
|
4917 |
|
4918 parentLUID.Zero(); |
4907 parentLUID.Zero(); |
4919 iPrevURI->Des().Format( KNullDesC8 ); |
4908 iPrevURI->Des().Format( KNullDesC8 ); |
4920 iPrevLUID = 0; |
4909 iPrevLUID = 0; |
4921 } |
4910 } |
4922 |
4911 |