diff -r 84d9eb65b26f -r 518b245aa84c messagingapp/msgappfw/utils/src/ccsdebug.cpp --- a/messagingapp/msgappfw/utils/src/ccsdebug.cpp Mon May 03 12:29:07 2010 +0300 +++ b/messagingapp/msgappfw/utils/src/ccsdebug.cpp Fri Jun 25 15:47:40 2010 +0530 @@ -69,19 +69,14 @@ dbgArr = static_cast( Dll::Tls() ); } - if ( dbgArr->IsEmpty() ) - { - delete dbgArr; - Dll::SetTls( NULL ); - } - else + if ( dbgArr && !(dbgArr->IsEmpty()) ) { CCsDebug* dbg = dbgArr->Pop(); dbg->UnMark(str); delete dbg; } - if ( !dbgArr && dbgArr->IsEmpty() ) + if ( dbgArr && dbgArr->IsEmpty() ) { delete dbgArr; Dll::SetTls( NULL );