diff -r 04ec7606545c -r fcc16690f446 persistentstorage/sql/SRC/Server/SqlSrvDatabase.cpp --- a/persistentstorage/sql/SRC/Server/SqlSrvDatabase.cpp Tue May 11 17:49:39 2010 +0300 +++ b/persistentstorage/sql/SRC/Server/SqlSrvDatabase.cpp Tue May 25 14:35:19 2010 +0300 @@ -963,12 +963,8 @@ err = StmtExec(stmtHandle); } } - TInt err2 = ::FinalizeStmtHandle(stmtHandle); + (void)::FinalizeStmtHandle(stmtHandle);//sqlite3_finalize() fails only if an invalid statement handle is passed. CleanupStack::PopAndDestroy();//TCleanupItem(&EnableAuthorizer, &iAuthorizerDisabled) - if(err == KErrNone && err2 != KErrNone) - {//::FinalizeStmtHandle() has failed - err = err2; - } __SQLLEAVE_IF_ERROR(err); TAttachCleanup attachCleanup(*this, aDbName); @@ -1013,11 +1009,7 @@ err = StmtExec(stmtHandle); } } - TInt err2 = ::FinalizeStmtHandle(stmtHandle); - if(err == KErrNone && err2 != KErrNone) - {//::FinalizeStmtHandle() has failed - err = err2; - } + (void)::FinalizeStmtHandle(stmtHandle);//sqlite3_finalize() fails only if an invalid statement handle is passed. iAuthorizerDisabled = EFalse; return err; }