diff -r 2b4ea9893b66 -r 6b6920c56e2f supl/locationomasuplprotocolhandler/protocolhandler/src/epos_comasuplinitilizerequestor.cpp --- a/supl/locationomasuplprotocolhandler/protocolhandler/src/epos_comasuplinitilizerequestor.cpp Tue Aug 31 15:37:04 2010 +0300 +++ b/supl/locationomasuplprotocolhandler/protocolhandler/src/epos_comasuplinitilizerequestor.cpp Wed Sep 01 12:24:21 2010 +0100 @@ -196,25 +196,13 @@ { RBuf HslpFromImsi; HslpFromImsi.CreateL(KMaxIPAddressLength); - CleanupClosePushL(HslpFromImsi); - - //Coverity fix - checking for return code of GenerateHslpAddressFromImsi - - TInt genError = iSuplSettings->GenerateHslpAddressFromImsi( HslpFromImsi ); - if(genError != KErrNone) - { - iTrace->Trace(_L("GenerateHslpAddressFromImsi failed - completing observer"), KTraceFileName, __LINE__); - CleanupStack::PopAndDestroy(); - iObserver.InitilizationCompletedL( genError ); - return; - } - iOMASuplSettings->SetHSLPAddressFromIMSI(HslpFromImsi); - CleanupStack::PopAndDestroy(); - iState = EInitializationComplete; - + CleanupClosePushL(HslpFromImsi); + iSuplSettings->GenerateHslpAddressFromImsi( HslpFromImsi ); + iOMASuplSettings->SetHSLPAddressFromIMSI(HslpFromImsi); + CleanupStack::PopAndDestroy(); + iState = EInitializationComplete; } - //comment to ignore coverity missing break error - //coverity[MISSING_BREAK :FALSE] + default: if( iState != EInitializationComplete && iVariantEnabled ) {