supl/locationsuplfw/gateway/src/epos_csuplsessionrequest.cpp
branchRCL_3
changeset 44 2b4ea9893b66
parent 42 02ba3f1733c6
child 45 6b6920c56e2f
--- a/supl/locationsuplfw/gateway/src/epos_csuplsessionrequest.cpp	Thu Aug 19 10:20:18 2010 +0300
+++ b/supl/locationsuplfw/gateway/src/epos_csuplsessionrequest.cpp	Tue Aug 31 15:37:04 2010 +0300
@@ -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,18 +317,13 @@
 	        	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);
 	        }
@@ -500,10 +495,9 @@
     {
     DEBUG_TRACE("CSuplSessionRequest::CancelTriggerringRequest", __LINE__)
     iRequestPhase = ESuplStopTriggerRequest;
-    iSessnMgr.CancelTriggerringSession(iSuplSessn); 
-    //SetActive();
+    iSessnMgr.CancelTriggerringSession(iSuplSessn);	
+	//SetActive();
     }
-
 // ---------------------------------------------------------
 // CSuplSessionRequest::MakeLocationConversionRequestL
 //
@@ -532,6 +526,5 @@
     DEBUG_TRACE("CSuplSessionRequest::CancelLocationConversionRequest", __LINE__)
     iRequestPhase = ESuplCancelLocationConversionRequest;
     iSessnMgr.CancelLocationConversionRequest(iSuplSessn); 
-    }
-    
+    }  
 //  End of File