diff -r 59575560d1e6 -r 793f76d9ab0c locationdataharvester/mylocationsengine/src/lookupmaptiledb.cpp --- a/locationdataharvester/mylocationsengine/src/lookupmaptiledb.cpp Wed Aug 18 09:43:18 2010 +0300 +++ b/locationdataharvester/mylocationsengine/src/lookupmaptiledb.cpp Thu Sep 02 20:20:42 2010 +0300 @@ -189,7 +189,9 @@ if (ret != KErrNone) { Close(); - Open(); + ret = Open(); + if( ret != KErrNone ) + return; } iItemsDatabase.Begin(); @@ -226,8 +228,9 @@ if (ret != KErrNone) { Close(); - Open(); - + ret = Open(); + if( ret != KErrNone ) + return; } iItemsDatabase.Begin(); @@ -270,8 +273,9 @@ if (ret != KErrNone) { Close(); - Open(); - + ret = Open(); + if( ret != KErrNone ) + return; } iItemsDatabase.Begin(); @@ -315,8 +319,9 @@ if (ret != KErrNone) { Close(); - Open(); - + ret = Open(); + if( ret != KErrNone ) + return; } iItemsDatabase.Begin(); @@ -366,7 +371,9 @@ if (ret != KErrNone) { Close(); - Open(); + ret = Open(); + if( ret != KErrNone ) + return; } iItemsDatabase.Begin(); @@ -430,8 +437,9 @@ if (ret != KErrNone) { Close(); - ret= Open(); - + ret = Open(); + if( ret != KErrNone ) + return; } iItemsDatabase.Begin(); @@ -472,8 +480,9 @@ if (ret != KErrNone) { Close(); - ret= Open(); - + ret = Open(); + if( ret != KErrNone ) + return; } iItemsDatabase.Begin(); @@ -496,6 +505,7 @@ } CleanupStack::PopAndDestroy( &myView ); // myView + Close(); } // ----------------------------------------------------------------------------- @@ -515,7 +525,9 @@ if (ret != KErrNone) { Close(); - Open(); + ret = Open(); + if( ret != KErrNone ) + return EFalse; } iItemsDatabase.Begin(); @@ -553,8 +565,9 @@ if (ret != KErrNone) { Close(); - Open(); - + ret = Open(); + if( ret != KErrNone ) + return EFalse; } iItemsDatabase.Begin();