--- a/omadmadapters/nsmldminternet/src/NSmlInternetAdapter.cpp Fri Aug 06 18:56:37 2010 +0530
+++ b/omadmadapters/nsmldminternet/src/NSmlInternetAdapter.cpp Thu Aug 19 17:35:23 2010 +0530
@@ -1726,13 +1726,17 @@
tableView->PutRecordChanges();
if (serviceReLock)
{
- DoProtectIAPRecordL(iapID4, ETrue);
+ TInt reclockerriap = DoProtectIAPRecordL(iapID4, ETrue);
TInt reclockerr = DoProtectServiceRecordL(iISPId, ETrue);
DBG_ARGS8(
_S8(
+ "CNSmlInternetAdapter::AddLeafObjectL ,UnProtecting IAP returned code = %d"),
+ reclockerriap);
+ DBG_ARGS8(
+ _S8(
"CNSmlInternetAdapter::AddLeafObjectL ,UnProtecting ServiceRecord returned code = %d"),
reclockerr);
- if (reclockerr == KErrNone)
+ if ((reclockerr == KErrNone) && (reclockerriap == KErrNone))
serviceReLock = EFalse;
}
CleanupStack::PopAndDestroy(); // tableView
@@ -3038,17 +3042,28 @@
CCommsDbTableView* networkView =
iDatabase->OpenViewMatchingUintLC(TPtrC(IAP), TPtrC(
COMMDB_ID), iapID);
- networkView->GotoFirstRecord();
- TRAPD(leavecode, networkView->ReadUintL(TPtrC(IAP_NETWORK),
+ errorCode = networkView->GotoFirstRecord();
+ if (errorCode == KErrNone)
+ {
+ TRAPD(leavecode, networkView->ReadUintL(TPtrC(IAP_NETWORK),
iISPId));
- CleanupStack::PopAndDestroy(); // networkView
- if (leavecode != 0)
+ CleanupStack::PopAndDestroy(); // networkView
+ if (leavecode != 0)
{
_DBG_FILE(
"CNSmlInternetAdapter::FetchLeafObjectL(internal)()(): ENotFound end");
CleanupStack::PopAndDestroy(pushed);
return CSmlDmAdapter::ENotFound;
}
+ }
+ else
+ {
+ CleanupStack::PopAndDestroy(); // networkView
+ _DBG_FILE(
+ "CNSmlInternetAdapter::FetchLeafObjectL(internal)()(): ENotFound end");
+ CleanupStack::PopAndDestroy(pushed);
+ return CSmlDmAdapter::ENotFound;
+ }
CCommsDbTableView* tableView = iDatabase->OpenViewMatchingUintLC(
TPtrC(NETWORK), TPtrC(COMMDB_ID), iISPId);
@@ -3323,13 +3338,14 @@
CCommsDbTableView* nwidView = iDatabase->OpenViewMatchingUintLC(
TPtrC(IAP), TPtrC(COMMDB_ID), iISPId);
- nwidView->GotoFirstRecord();
- nwidView->ReadUintL(TPtrC(IAP_NETWORK), iISPId);
+ if (nwidView->GotoFirstRecord() == KErrNone)
+ {
+ nwidView->ReadUintL(TPtrC(IAP_NETWORK), iISPId);
+ aObject.InsertL(aObject.Size(), SetIntObjectLC(iISPId));
+ pushed++;
+ }
CleanupStack::PopAndDestroy(); // nwidView
-
- aObject.InsertL(aObject.Size(), SetIntObjectLC(iISPId));
- pushed++;
- }
+ }
else if (aURI.Match(_L8("AP/*/Px/*/PortNbr")) != KErrNotFound)
{
_DBG_FILE(