supl/locationomasuplprotocolhandler/protocolhandler/src/epos_comasuplprotocolmanager.cpp
--- a/supl/locationomasuplprotocolhandler/protocolhandler/src/epos_comasuplprotocolmanager.cpp Tue Feb 02 10:12:24 2010 +0200
+++ b/supl/locationomasuplprotocolhandler/protocolhandler/src/epos_comasuplprotocolmanager.cpp Fri Feb 19 23:14:27 2010 +0200
@@ -243,17 +243,32 @@
aStatus = KRequestPending;
TRequestStatus *status = &aStatus;
- if( iIsInitilized && iOMASuplProtocolHandler1 )
+
+ if( iIsInitilized )
{
- iOMASuplProtocolHandler1->RunSessionL(
- aSuplSession,
+ if( aSuplSession->GetSUPLVersion() == 1 )
+ {
+ iOMASuplProtocolHandler1->RunSessionL(
+ aSuplSession,
aStatus,
aHslpAddress,
aFallBack,
aFirstReq,
aAllowedCapabilities,
aRequestID);
- }
+ }
+ else if( aSuplSession->GetSUPLVersion() == 2 )
+ {
+ iOMASuplProtocolHandler2->RunSessionL(
+ aSuplSession,
+ aStatus,
+ aHslpAddress,
+ aFallBack,
+ aFirstReq,
+ aAllowedCapabilities,
+ aRequestID);
+ }
+ }
else
{
User::RequestComplete(status,KErrOMASuplUnInitilized);
@@ -281,7 +296,9 @@
aStatus = KRequestPending;
TRequestStatus *status = &aStatus;
- if( iIsInitilized && iOMASuplProtocolHandler1 )
+ if( iIsInitilized )
+ {
+ if( aSuplSession->GetSUPLVersion() == 1 )
{
iOMASuplProtocolHandler1->RunSessionL(
aSuplSession,
@@ -292,7 +309,20 @@
aAllowedCapabilities,
aQop,
aRequestID);
- }
+ }
+ else if( aSuplSession->GetSUPLVersion() == 2 )
+ {
+ iOMASuplProtocolHandler2->RunSessionL(
+ aSuplSession,
+ aStatus,
+ aHslpAddress,
+ aFallBack,
+ aFirstReq,
+ aAllowedCapabilities,
+ aQop,
+ aRequestID);
+ }
+ }
else
{
User::RequestComplete(status,KErrOMASuplUnInitilized);