--- a/satengine/satserver/Commands/SendUSSDCmd/src/CSendUssdHandler.cpp Fri Sep 17 17:09:13 2010 +0300
+++ b/satengine/satserver/Commands/SendUSSDCmd/src/CSendUssdHandler.cpp Mon Oct 04 15:57:13 2010 +0300
@@ -572,9 +572,7 @@
{
LOG( SIMPLE,
"SENDUSSD: CSendUssdHandler::CSendUssdHandler calling" )
- TRAPD( result, iIsSatDisplayUssdResult = SatDisplayUssdResultL(); )
- LOG2( NORMAL, "SENDUSSD: CSendUssdHandler::CSendUssdHandler \
- get CRepository key failed result: %d", result )
+ TRAP_IGNORE( iIsSatDisplayUssdResult = SatDisplayUssdResultL(); )
LOG( SIMPLE,
"SENDUSSD: CSendUssdHandler::CSendUssdHandler exiting" )
@@ -986,13 +984,12 @@
CRepository* repository = NULL;
repository = CRepository::NewL( KCRUidSatServer );
- if ( repository )
+ result = repository->Get( KSatDisplayUssdResult, ussdDisplayResult );
+ if ( result != KErrNone )
{
- result = repository->Get( KSatDisplayUssdResult, ussdDisplayResult );
- LOG3( NORMAL,
- "SENDUSSD: CSendUssdHandler::CSendUssdHandler \
- get CRepository key DisplayResult: %d, result: %d ",
- ussdDisplayResult, result )
+ LOG2( NORMAL,
+ "SENDUSSD: CSendUssdHandler::CSendUssdHandler "
+ "get CRepository key failed. err=%d", result )
}
delete repository;