24 |
24 |
25 |
25 |
26 |
26 |
27 |
27 |
28 // INCLUDE FILES |
28 // INCLUDE FILES |
29 #include "senserviceconnection.h" |
29 #include <SenServiceConnection.h> |
30 #include "senhttpchanneltransportplugin.h" |
30 #include "senhttpchanneltransportplugin.h" |
31 #include "senhttpchannelimpl.h" |
31 #include "senhttpchannelimpl.h" |
32 #include "senhttpsyncrequester.h" |
32 #include "senhttpsyncrequester.h" |
33 #include "senxmlutils.h" |
33 #include "SenXmlUtils.h" |
34 #include "senidentityprovider.h" |
34 #include "SenIdentityProvider.h" |
35 #include "senwspattern.h" |
35 #include "senwspattern.h" |
36 #include "senfragment.h" |
36 #include "SenFragment.h" |
37 #include "senelement.h" |
37 #include "SenElement.h" |
38 #include "sendebug.h" |
38 #include "sendebug.h" |
39 #include "msenproperty.h" |
39 #include "MSenProperty.h" |
40 #include "senhttptransportproperties.h" // Utils\inc |
40 #include "SenHttpTransportProperties.h" // Utils\inc |
41 #include "sentransportcontext.h" |
41 #include "sentransportcontext.h" |
42 #include "senlayeredhttptransportproperties.h" // internal Framework\inc |
42 #include "senlayeredhttptransportproperties.h" // internal Framework\inc |
43 #include "msenmessagecontext.h" |
43 #include "msenmessagecontext.h" |
44 #include "msenmessage.h" |
44 #include "MSenMessage.h" |
45 #include "sensoapmessage2.h" |
45 #include "SenSoapMessage2.h" |
46 #include "rsendocument.h" |
46 #include "RSenDocument.h" |
47 #include "senparser.h" |
47 #include "SenParser.h" |
48 #include "senservicesession.h" |
48 #include "senservicesession.h" |
49 #include "senlogger.h" |
49 #include "senlogger.h" |
50 #include "senclientsession.h" |
50 #include "senclientsession.h" |
51 #include <xmlengchunkcontainer.h> |
51 #include <xmlengchunkcontainer.h> |
52 #include <xmlengfilecontainer.h> |
52 #include <xmlengfilecontainer.h> |
606 return KErrNone; |
606 return KErrNone; |
607 } |
607 } |
608 |
608 |
609 TInt CSenHttpChannelTransportPlugin::ResetHttpChannelByIapIdL(TUint32 aIapId) |
609 TInt CSenHttpChannelTransportPlugin::ResetHttpChannelByIapIdL(TUint32 aIapId) |
610 { |
610 { |
611 TLSLOG_L(KSenHttpChannelObserverLogChannelBase,KMinLogLevel,"CSenHttpChannelTransportPlugin::ResetHttpChannelByIapIdL()"); |
|
612 TUint32 effectiveIapId(KErrNone); |
611 TUint32 effectiveIapId(KErrNone); |
613 TBool explicitIapIdDefined(EFalse); |
612 TBool explicitIapIdDefined(EFalse); |
614 if(iHttpChannel) |
613 if(iHttpChannel) |
615 { |
614 { |
616 explicitIapIdDefined = iHttpChannel->EffectiveIapId(effectiveIapId); |
615 explicitIapIdDefined = iHttpChannel->EffectiveIapId(effectiveIapId); |
617 } |
616 } |
618 |
617 |
619 TInt retVal(KErrNone); |
618 TInt retVal(KErrNone); |
620 TLSLOG_FORMAT((KSenHttpChannelObserverLogChannelBase,KMinLogLevel, _L8("- explicitIapIdDefined[%d], effectiveIapId[%d], aIapId[%d]"), explicitIapIdDefined, effectiveIapId, aIapId)); |
619 if(!explicitIapIdDefined || explicitIapIdDefined && effectiveIapId != aIapId) |
621 if(!explicitIapIdDefined || (explicitIapIdDefined && (effectiveIapId != aIapId) )) |
|
622 { |
620 { |
623 TLSLOG_L(KSenHttpChannelObserverLogChannelBase,KMinLogLevel,"CSenHttpChannelTransportPlugin::ResetHttpChannel():"); |
621 TLSLOG_L(KSenHttpChannelObserverLogChannelBase,KMinLogLevel,"CSenHttpChannelTransportPlugin::ResetHttpChannel():"); |
624 |
622 |
625 delete iHttpChannel; |
623 delete iHttpChannel; |
626 iHttpChannel = NULL; |
624 iHttpChannel = NULL; |
627 delete iRequester; |
625 delete iRequester; |
628 iRequester = NULL; |
626 iRequester = NULL; |
629 TLSLOG_FORMAT((KSenHttpChannelObserverLogChannelBase,KMinLogLevel, _L8("- New IAP ID: %d"), aIapId)); |
627 TLSLOG_FORMAT((KSenHttpChannelObserverLogChannelBase,KNormalLogLevel, _L8("- New IAP ID: %d"), aIapId)); |
630 CSenHttpChannel* pHttpChannel = CSenHttpChannelImpl::NewL(iServiceManager, aIapId); |
628 CSenHttpChannel* pHttpChannel = CSenHttpChannelImpl::NewL(iServiceManager, aIapId); |
631 |
629 |
632 CleanupStack::PushL(pHttpChannel); |
630 CleanupStack::PushL(pHttpChannel); |
633 |
631 |
634 CSenHttpSyncRequester* pRequester = CSenHttpSyncRequester::NewL(pHttpChannel, this); |
632 CSenHttpSyncRequester* pRequester = CSenHttpSyncRequester::NewL(pHttpChannel, this); |