--- a/omaprovisioning/provisioning/ProvisioningEngine/Src/CWPInternetAPDB.cpp	Tue Aug 31 16:04:06 2010 +0300
+++ b/omaprovisioning/provisioning/ProvisioningEngine/Src/CWPInternetAPDB.cpp	Wed Sep 01 12:27:42 2010 +0100
@@ -241,9 +241,9 @@
     Myview.Prepare(iItemsDatabase, TDbQuery(QueryBuffer));
     CleanupClosePushL(Myview);
     Myview.EvaluateAll();
-    if ( Myview.FirstL())
-    {
-    	while (Myview.AtRow())
+    Myview.FirstL();
+
+    while (Myview.AtRow())
         {
         Myview.GetL();
 
@@ -256,7 +256,6 @@
         aItemArray.Append(AccessPointItem);
         Myview.NextL();
         }
-    }
 
     CleanupStack::PopAndDestroy(); // Myview
     FLOG( _L( "[Provisioning] CWPInternetAPDB::ReadItemsL: done" ) );
@@ -324,9 +323,9 @@
     CleanupClosePushL(Myview);
 
     Myview.EvaluateAll();
-    if( Myview.FirstL())
-    {
-    	if (!Myview.IsEmptyL())
+    Myview.FirstL();
+
+    if (!Myview.IsEmptyL())
         {
         // we have autoincrement in index so it should be unique
         // but just to make sure, we use 'while', instead of 'if'
@@ -342,7 +341,6 @@
         iItemsDatabase.Compact();
         rowsdeleted = ETrue;
         }
-    }
     CleanupStack::PopAndDestroy(1); // Myview
 
     FLOG( _L( "[Provisioning] CWPInternetAPDB::DeleteFromDatabaseL: done" ) );