diff -r 8bd192d47aaa -r 2729d20a0010 harvester/harvesterserver/src/ccontentinfodb.cpp --- a/harvester/harvesterserver/src/ccontentinfodb.cpp Mon Aug 09 10:51:30 2010 +0530 +++ b/harvester/harvesterserver/src/ccontentinfodb.cpp Wed Aug 25 13:17:41 2010 +0530 @@ -266,9 +266,12 @@ sql.Format( KCISqlFormatSeek, &aContentName ); RSqlStatement stmt; - stmt.Prepare( iDatabase , sql ); - - TBool isfound = ( KSqlAtRow == stmt.Next() )?ETrue:EFalse; + TBool isfound = EFalse; + //Error check necessary to avoid sqldb 2 panic, + //if sqlstatement preparation fails, call to Next() raises this panic + TInt err = stmt.Prepare( iDatabase , sql ); + if ( err == KErrNone) + isfound = ( KSqlAtRow == stmt.Next() )?ETrue:EFalse; OstTraceFunctionExit0( CCONTENTINFODB_FINDL_EXIT ); return isfound; } @@ -290,11 +293,14 @@ sql.Copy( KSelectAllRowsFormat ); RSqlStatement stmt; - stmt.Prepare( iDatabase , sql ); - - while ( KSqlAtEnd != stmt.Next() ) - ++count; - + TInt err = stmt.Prepare( iDatabase , sql ); + //Error check necessary to avoid sqldb 2 panic, + //if sqlstatement preparation fails, call to Next() raises this panic + if( err == KErrNone) + { + while ( KSqlAtEnd != stmt.Next() ) + ++count; + } OstTraceFunctionExit0( CCONTENTINFODB_GETCONTENTCOUNTL_EXIT ); return count; }