diff -r 2b4ea9893b66 -r 6b6920c56e2f supl/locationsuplfw/gateway/src/epos_csuplsessionrequest.cpp --- a/supl/locationsuplfw/gateway/src/epos_csuplsessionrequest.cpp Tue Aug 31 15:37:04 2010 +0300 +++ b/supl/locationsuplfw/gateway/src/epos_csuplsessionrequest.cpp Wed Sep 01 12:24:21 2010 +0100 @@ -97,7 +97,7 @@ CSuplSessionRequest::~CSuplSessionRequest() { DEBUG_TRACE("CSuplSessionRequest::~CSuplSessionRequest", __LINE__) - iSessnMgr.RemoveFromQueueForReIssueRequest(*this); + //iSessnMgr.RemoveFromQueueForReIssueRequest(*this); if (iParamExtendedFallback) { @@ -300,11 +300,11 @@ } case ESuplSessionRequest: case ESuplRetryingSession: - { + { iRequestPhase = ESuplReqInactive; iObserver->CompleteRunSession(err); - break; - } + break; + } case ESuplCancelRunSessionRequest: { iRequestPhase = ESuplReqInactive; @@ -317,13 +317,18 @@ iNetObserver->CompleteForwardMessageL(iHandle); break; } - case ESuplLocationConversionRequest: - case ESuplCancelLocationConversionRequest: - { - iRequestPhase = ESuplReqInactive; - iObserver->CompleteRunSession(err); - break; - } + + case ESuplLocationConversionRequest: + case ESuplCancelLocationConversionRequest: + { + iRequestPhase = ESuplReqInactive; + iObserver->CompleteRunSession(err); + break; + } + + + + default : DebugPanic(EPosSuplServerPanicRequestInconsistency); } @@ -495,9 +500,10 @@ { DEBUG_TRACE("CSuplSessionRequest::CancelTriggerringRequest", __LINE__) iRequestPhase = ESuplStopTriggerRequest; - iSessnMgr.CancelTriggerringSession(iSuplSessn); - //SetActive(); + iSessnMgr.CancelTriggerringSession(iSuplSessn); + //SetActive(); } + // --------------------------------------------------------- // CSuplSessionRequest::MakeLocationConversionRequestL // @@ -526,5 +532,6 @@ DEBUG_TRACE("CSuplSessionRequest::CancelLocationConversionRequest", __LINE__) iRequestPhase = ESuplCancelLocationConversionRequest; iSessnMgr.CancelLocationConversionRequest(iSuplSessn); - } + } + // End of File