diff -r 150a13bad6af -r 0802db42e4e9 webservices/wsconnection/src/senserviceconnectionimpl.cpp --- a/webservices/wsconnection/src/senserviceconnectionimpl.cpp Tue Jan 26 13:03:48 2010 +0200 +++ b/webservices/wsconnection/src/senserviceconnectionimpl.cpp Sun May 30 23:54:06 2010 +0530 @@ -45,9 +45,9 @@ #include "senservicemanagerdefines.h" #include "SenBaseAttribute.h" -#include -#include -#include +#include +#include +#include #include "senconnagentserver.h" #include "senxmldebug.h" #include "senatomentry.h" @@ -192,7 +192,7 @@ void CSenServiceConnectionImpl::ConstructL(MSenServiceDescription& aSD) { - + TLSLOG_L(KSenServiceConnectionLogChannelBase+iConnectionID, KMinLogLevel ,"CSenServiceConnectionImpl::ConstructL(aSD)"); CSenElement& sdAsElement = ((CSenXmlServiceDescription&)aSD).AsElement(); // Check if this is an internal service connection: @@ -247,7 +247,8 @@ #ifndef RD_SEN_SC_PROXY_ENABLED_BY_DEFAULT ConnectL(); // #else // ConnectL occurs on "proxy" / factory -level -#endif +#endif + TLSLOG_L(KSenServiceConnectionLogChannelBase+iConnectionID, KMinLogLevel ,"CSenServiceConnectionImpl::ConstructL(aSD) Completed"); } @@ -343,12 +344,14 @@ void CSenServiceConnectionImpl::SetConsumer( MSenServiceConsumer& aConsumer, MSenExtendedConsumerInterface* apExtConsumer ) { + TLSLOG_L(KSenServiceConnectionLogChannelBase+iConnectionID, KMinLogLevel ,"CSenServiceConnectionImpl::SetConsumer"); iObserver = &aConsumer; ipExtendedConsumerInterface = apExtConsumer; } void CSenServiceConnectionImpl::Consumer( MSenServiceConsumer*& aConsumer, MSenExtendedConsumerInterface*& apExtConsumer ) { + TLSLOG_L(KSenServiceConnectionLogChannelBase+iConnectionID, KMinLogLevel ,"CSenServiceConnectionImpl::Consumer"); aConsumer = iObserver; apExtConsumer = ipExtendedConsumerInterface; } @@ -451,6 +454,7 @@ { iChunkMap->Reset(); delete iChunkMap; + iChunkMap = NULL; } delete iInBuf; @@ -478,6 +482,7 @@ TPtrC CSenServiceConnectionImpl::SessionID() { + TLSLOG(KSenServiceConnectionLogChannelBase+iConnectionID, KMinLogLevel,(_L("CSenServiceConnectionImpl::SessionID()"))); if(ipSessionId) { return *ipSessionId; @@ -644,6 +649,7 @@ TInt CSenServiceConnectionImpl::ResponseFromChunk(CSenChunk& aClientOp, HBufC8*& aResponseTo) { + TLSLOG(KSenServiceConnectionLogChannelBase+iConnectionID, KMinLogLevel,(_L("CSenServiceConnectionImpl::ResponseFromChunk()"))); TInt leaveCode(KErrNone); // handle OOM case: // Read response message, SOAP fault OR error TPtrC8 response; @@ -659,7 +665,7 @@ // OOM occured retVal = leaveCode; } - + TLSLOG(KSenServiceConnectionLogChannelBase+iConnectionID, KMinLogLevel,(_L("CSenServiceConnectionImpl::ResponseFromChunk() Completed"))); return retVal; } @@ -875,7 +881,7 @@ } else if (!IsActive()) { - SetActive(); + SetActive(); iStatus = KRequestPending; } TLSLOG(KSenServiceConnectionLogChannelBase+iConnectionID, KMinLogLevel,(_L("CSenServiceConnectionImpl::CheckConnection Completed"))); @@ -916,7 +922,7 @@ TInt appendRetVal(KErrNone); appendRetVal = ChunkMapL().Append( pTxnId, apClientOp ); - TLSLOG_FORMAT((KSenServiceConnectionLogChannelBase+iConnectionID, KNormalLogLevel , _L8("- ChunkMapL().Append(%d, %d) returned: %d"), *pTxnId, apClientOp->Chunk().Handle(), appendRetVal)); + TLSLOG_FORMAT((KSenServiceConnectionLogChannelBase+iConnectionID, KMinLogLevel , _L8("- ChunkMapL().Append(%d, %d) returned: %d"), *pTxnId, apClientOp->Chunk().Handle(), appendRetVal)); if( appendRetVal == KErrNone ) { TMessage msg; @@ -1301,11 +1307,12 @@ TLSLOG_FORMAT((KSenServiceConnectionLogChannelBase+iConnectionID, KMinLogLevel , _L8("MSenServiceConsumer::HandleErrorL leaved: %d"), leaveCode )); } } - + TLSLOG(KSenServiceConnectionLogChannelBase+iConnectionID, KMinLogLevel,(_L("CSenServiceConnectionImpl::InitializeL() Completed"))); } TPtrC CSenServiceConnectionImpl::NextChunkName() { + TLSLOG(KSenServiceConnectionLogChannelBase+iConnectionID, KMinLogLevel,(_L("CSenServiceConnectionImpl::NextChunkName()"))); if(ipChunkName) { iChunkNameNumber++; @@ -1332,6 +1339,7 @@ } else { + TLSLOG(KSenServiceConnectionLogChannelBase+iConnectionID, KMinLogLevel,(_L("CSenServiceConnectionImpl::NextChunkName() returns KNullDesC()"))); return KNullDesC(); } } @@ -1934,6 +1942,7 @@ break ; } } + TLSLOG_L(KSenServiceConnectionLogChannelBase+iConnectionID, KMinLogLevel ,"CSenServiceConnectionImpl::HandleMessageFromChildAOL Completed"); } // Helper function, which delivers response to Service Consumer @@ -1976,7 +1985,7 @@ if( statusCode == KErrNone ) { // STANDARD, "OK" RESPONSE - TLSLOG_FORMAT((KSenServiceConnectionLogChannelBase+iConnectionID, KNormalLogLevel , _L8("- response, (%d bytes):"), response.Length())); + TLSLOG_FORMAT((KSenServiceConnectionLogChannelBase+iConnectionID, KMinLogLevel , _L8("- response, (%d bytes):"), response.Length())); TLSLOG_ALL(KSenServiceConnectionLogChannelBase+iConnectionID, KMaxLogLevel ,(response)); TRAPD( err, iObserver->HandleMessageL( response ); ) if(err) @@ -1991,8 +2000,8 @@ TInt error = statusCode; // SOAP FAULT - TLSLOG_FORMAT((KSenServiceConnectionLogChannelBase+iConnectionID, KNormalLogLevel , _L8("- SOAP fault (%d bytes):"), response.Length())); - TLSLOG_ALL(KSenServiceConnectionLogChannelBase+iConnectionID, KMaxLogLevel ,(response)); + TLSLOG_FORMAT((KSenServiceConnectionLogChannelBase+iConnectionID, KMinLogLevel , _L8("- SOAP fault (%d bytes):"), response.Length())); + TLSLOG_ALL(KSenServiceConnectionLogChannelBase+iConnectionID, KMinLogLevel ,(response)); if ( error == KErrSenSoapFault && !iInitialized ) // China DC { @@ -2024,6 +2033,7 @@ CleanupStack::PopAndDestroy( pMessage ); } iTransactionIdKnown = EFalse; + TLSLOG_L(KSenServiceConnectionLogChannelBase+iConnectionID, KMinLogLevel ,"CSenServiceConnectionImpl::DeliverResponseL Completed"); } void CSenServiceConnectionImpl::DoCancel() @@ -2290,6 +2300,7 @@ const TDesC8& CSenServiceConnectionImpl::LocalName() const { + TLSLOG(KSenServiceConnectionLogChannelBase+iConnectionID, KMinLogLevel,(_L("CSenServiceConnectionImpl::LocalName()"))); if(iFragment) return iFragment->LocalName(); else @@ -2298,6 +2309,7 @@ const TDesC8& CSenServiceConnectionImpl::NsUri() const { + TLSLOG(KSenServiceConnectionLogChannelBase+iConnectionID, KMinLogLevel,(_L("CSenServiceConnectionImpl::NsUri()"))); if(iFragment) return iFragment->NsUri(); else @@ -2306,6 +2318,7 @@ const TDesC8& CSenServiceConnectionImpl::NsPrefix() const { + TLSLOG(KSenServiceConnectionLogChannelBase+iConnectionID, KMinLogLevel,(_L("CSenServiceConnectionImpl::NsPrefix()"))); if(iFragment) return iFragment->NsPrefix(); else @@ -2314,6 +2327,7 @@ void CSenServiceConnectionImpl::WriteAsXMLToL(RWriteStream& aWriteStream) { + TLSLOG(KSenServiceConnectionLogChannelBase+iConnectionID, KMinLogLevel,(_L("CSenServiceConnectionImpl::WriteAsXMLToL()"))); if(iFragment) { iFragment->WriteAsXMLToL(aWriteStream); @@ -2322,6 +2336,7 @@ HBufC* CSenServiceConnectionImpl::AsXmlUnicodeL() { + TLSLOG(KSenServiceConnectionLogChannelBase+iConnectionID, KMinLogLevel,(_L("CSenServiceConnectionImpl::AsXmlUnicodeL()"))); if(iFragment) { return iFragment->AsXmlUnicodeL(); @@ -2334,6 +2349,7 @@ HBufC8* CSenServiceConnectionImpl::AsXmlL() { + TLSLOG(KSenServiceConnectionLogChannelBase+iConnectionID, KMinLogLevel,(_L("CSenServiceConnectionImpl::AsXmlL()"))); if(iFragment) { return iFragment->AsXmlL(); @@ -2384,6 +2400,7 @@ TBool CSenServiceConnectionImpl::ConsistsOfL(MSenFragment& aCandidate) { + TLSLOG(KSenServiceConnectionLogChannelBase+iConnectionID, KMinLogLevel,(_L("CSenServiceConnectionImpl::ConsistsOfL()"))); if (iFragment) { return iFragment->ConsistsOfL(aCandidate); @@ -2424,6 +2441,7 @@ TInt CSenServiceConnectionImpl::TxnId() { + TLSLOG(KSenServiceConnectionLogChannelBase+iConnectionID, KMinLogLevel,(_L("CSenServiceConnectionImpl::TxnId()"))); if( iTransactionIdKnown ) { if( iTxnId>KErrNone ) @@ -2481,6 +2499,7 @@ TInt CSenServiceConnectionImpl::CancelTransaction(TInt aTransactionID) { + TLSLOG_L(KSenServiceConnectionLogChannelBase+iConnectionID, KMinLogLevel ,"CSenServiceConnectionImpl::CancelTransaction"); TInt retVal(0); if ( iDispatcherEnabled ) // DISPATCHER IS ENABLED { @@ -2511,6 +2530,7 @@ TRAP(retVal, DeliverResponseL(KErrSenCancelled,NULL)); if( retVal != KErrNone) { + TLSLOG_FORMAT((KSenServiceConnectionLogChannelBase+iConnectionID, KMinLogLevel , _L8("CSenServiceConnectionImpl::CancelTransaction returns [%d]" ), retVal )); return retVal; } } @@ -2519,6 +2539,7 @@ { iConnection.CancelRequest(aTransactionID); } + TLSLOG_FORMAT((KSenServiceConnectionLogChannelBase+iConnectionID, KMinLogLevel , _L8("CSenServiceConnectionImpl::CancelTransaction returns [%d]" ), KErrNone )); return KErrNone; } @@ -2554,6 +2575,7 @@ RChunkMap& CSenServiceConnectionImpl::ChunkMapL() { + TLSLOG(KSenServiceConnectionLogChannelBase+iConnectionID, KMinLogLevel,(_L("CSenServiceConnectionImpl::ChunkMapL()"))); if(!iChunkMap) { iChunkMap = new (ELeave) RChunkMap(ETrue, ETrue); @@ -2563,6 +2585,7 @@ RPointerArray& CSenServiceConnectionImpl::AsyncOpsArrayL() //codescannerwarnings { + TLSLOG(KSenServiceConnectionLogChannelBase+iConnectionID, KMinLogLevel,(_L("CSenServiceConnectionImpl::AsyncOpsArrayL()"))); if(!iAsyncOpsArray) { iAsyncOpsArray = new (ELeave) RPointerArray; @@ -2833,6 +2856,7 @@ CSenSoapEnvelope& aMessage, const TDesC8& aProperties) //codescannerwarnings { + TLSLOG(KSenServiceConnectionLogChannelBase+iConnectionID, KMinLogLevel,(_L("CSenServiceConnectionImpl::AssignPropertiesToChunkL()"))); TInt retVal(KErrNone); if ( aMessage.SoapAction2().Length() > 0 ) @@ -2869,7 +2893,7 @@ } delete pSoapMsg; } - + TLSLOG_FORMAT((KSenServiceConnectionLogChannelBase+iConnectionID, KMinLogLevel , _L8("CSenServiceConnectionImpl::AssignPropertiesToChunkL returns [%d]" ), retVal )); return retVal; } @@ -2998,7 +3022,7 @@ CleanupStack::PopAndDestroy(pSerializer); CleanupStack::PopAndDestroy(&buffer); CleanupStack::PopAndDestroy(pPropsAsXml); - + TLSLOG_FORMAT((KSenServiceConnectionLogChannelBase+iConnectionID, KMinLogLevel , _L8("CSenServiceConnectionImpl::AssignMessageToChunkL returns [%d]" ), retVal )); return retVal; } @@ -3006,6 +3030,7 @@ // plus multiple BLOBs PER ONE MESSAGE AND multiple simultaneous transfers TInt CSenServiceConnectionImpl::MoveBinaryContainersToServer( CSenConnectionChunk& aOperation, RArray& aList ) { + TLSLOG(KSenServiceConnectionLogChannelBase+iConnectionID, KMinLogLevel,(_L("CSenServiceConnectionImpl::MoveBinaryContainersToServer()"))); TInt retVal(KErrNone); TPtrC8 cid8; @@ -3100,12 +3125,14 @@ } } } - } + } + TLSLOG_FORMAT((KSenServiceConnectionLogChannelBase+iConnectionID, KMinLogLevel , _L8("CSenServiceConnectionImpl::MoveBinaryContainersToServer returns [%d]" ), retVal )); return retVal; } TInt CSenServiceConnectionImpl::MoveFileChunkHandleToServer(CSenConnectionChunk& aOperation) { + TLSLOG(KSenServiceConnectionLogChannelBase+iConnectionID, KMinLogLevel,(_L("CSenServiceConnectionImpl::MoveFileChunkHandleToServer()"))); TInt retVal(KErrNone); retVal = iConnection.SendFileHandle(aOperation,iSharedFileHandle); return retVal; @@ -3170,6 +3197,7 @@ TInt CSenServiceConnectionImpl::SendL( MSenMessage& aMessage ) { + TLSLOG(KSenServiceConnectionLogChannelBase+iConnectionID, KMinLogLevel,(_L("CSenServiceConnectionImpl::MoveFileChunkHandleToServer(aMessage)"))); if ( aMessage.IsSafeToCast( MSenMessage::ESoapEnvelope2 ) ) { CSenSoapEnvelope2& message = (CSenSoapEnvelope2&)aMessage; @@ -3269,6 +3297,7 @@ TInt CSenServiceConnectionImpl::SubmitL( MSenMessage& aMessage, CSenSoapEnvelope2*& aResponseTo ) { + TLSLOG(KSenServiceConnectionLogChannelBase+iConnectionID, KMinLogLevel,(_L("CSenServiceConnectionImpl::SubmitL(aMessage, aResponseTo)"))); if ( aMessage.IsSafeToCast( MSenMessage::ESoapEnvelope2) ) { CSenSoapEnvelope2& message = (CSenSoapEnvelope2&)aMessage; @@ -3440,6 +3469,7 @@ void CSenServiceConnectionImpl::MigrateToPrefferedCarrierL(TBool &aUserChoice) { + TLSLOG(KSenServiceConnectionLogChannelBase+iConnectionID, KMinLogLevel,(_L("CSenServiceConnectionImpl::MigrateToPrefferedCarrierL()"))); if (iMobiltyObserver) { User::LeaveIfError(iConnection.MigrateToPrefferedCarrierL(aUserChoice)); @@ -3448,10 +3478,12 @@ { User::Leave(KErrNotFound); } + TLSLOG(KSenServiceConnectionLogChannelBase+iConnectionID, KMinLogLevel,(_L("CSenServiceConnectionImpl::MigrateToPrefferedCarrierL() Completed"))); } void CSenServiceConnectionImpl::NewCarrierAcceptedL(TBool &aUserChoice) { + TLSLOG(KSenServiceConnectionLogChannelBase+iConnectionID, KMinLogLevel,(_L("CSenServiceConnectionImpl::NewCarrierAcceptedL()"))); if (iMobiltyObserver) { User::LeaveIfError(iConnection.NewCarrierAcceptedL(aUserChoice)); @@ -3459,7 +3491,8 @@ else { User::Leave(KErrNotFound); - } + } + TLSLOG(KSenServiceConnectionLogChannelBase+iConnectionID, KMinLogLevel,(_L("CSenServiceConnectionImpl::NewCarrierAcceptedL() Completed"))); } #endif @@ -3468,6 +3501,7 @@ TBool aIncoming, const TDesC8& aMessage, const TDesC8& aCid, TInt aProgress) { + TLSLOG(KSenServiceConnectionLogChannelBase+iConnectionID, KMinLogLevel,(_L("CSenServiceConnectionImpl::SendProgressToHostlet()"))); TBool isSoap = (aMessage != KNullDesC8); TPtrC8 ptr; if (isSoap) @@ -3500,6 +3534,7 @@ TLSLOG_FORMAT(( iTlsLogStatusChannel, KSenServiceConnectionStatusLogLevel, _L("Fatal(!) -- CSenServiceConnectionImpl::DeliverStatus(): MSenServiceConsumer::SetStatus - leaves with %d"), leaveCode)); leaveCode = KErrNone; } + TLSLOG(KSenServiceConnectionLogChannelBase+iConnectionID, KMinLogLevel,(_L("CSenServiceConnectionImpl::DeliverStatus() Completed"))); } @@ -3564,7 +3599,8 @@ } TInt CSenServiceConnectionImpl::SearchIdentityProviderL( CSenIdentityProvider*& apIdentityProvider, const TDesC8& aProviderId ) - { + { + TLSLOG(KSenServiceConnectionLogChannelBase+iConnectionID, KMinLogLevel,(_L("CSenServiceConnectionImpl::SearchIdentityProviderL()"))); TInt retVal(KErrNone); CSenChunk* pSenChunk = CSenChunk::NewLC(NextChunkName()); @@ -3603,7 +3639,7 @@ } } CleanupStack::PopAndDestroy(pSenChunk); - + TLSLOG_FORMAT((KSenServiceConnectionLogChannelBase+iConnectionID, KMinLogLevel , _L8("CSenServiceConnectionImpl::SearchIdentityProviderL returns [%d]" ), retVal )); return retVal; } @@ -3654,6 +3690,7 @@ TBool CSenServiceConnectionImpl::HasConnectionAgentCallbackInitialized() { + TLSLOG(KSenServiceConnectionLogChannelBase+iConnectionID, KMinLogLevel,(_L("CSenServiceConnectionImpl::HasConnectionAgentCallbackInitialized()"))); #ifdef __ENABLE_ALR__ if((ipAuthProvider || iFilesObserver || iMobiltyObserver || ipCoBrandingObserver) && iConnectionAgentCallbackInitialized) #else @@ -3754,6 +3791,7 @@ void CSenServiceConnectionImpl::DataTrafficDetails(TSenDataTrafficDetails& aDetails, TSenDataTrafficOperations& aOperations) { + TLSLOG(KSenServiceConnectionLogChannelBase+iConnectionID, KMinLogLevel,(_L("CSenServiceConnectionImpl::DataTrafficDetails()"))); iConnection.DataTrafficDetails(aDetails, aOperations); } @@ -3782,6 +3820,7 @@ TInt CSenServiceConnectionImpl::PendingTrasanctionsCount() { + TLSLOG(KSenServiceConnectionLogChannelBase+iConnectionID, KMinLogLevel,(_L("CSenServiceConnectionImpl::PendingTrasanctionsCount()"))); return iAsyncOpsArray->Count(); } @@ -3822,7 +3861,8 @@ sizeof(TInt), sizeof(TInt)); - SetActive(); + if(!IsActive()) + SetActive(); iStatus = KRequestPending; #ifdef EKA2 iActive->AsyncOpsArrayL().AppendL(this); //codescannerwarnings @@ -3918,7 +3958,8 @@ CActiveScheduler::Add(this); // Initial subscription iConnectionStatusProperty.Subscribe(iStatus); - SetActive(); + if(!IsActive()) + SetActive(); iStatus = KRequestPending; } @@ -3942,7 +3983,8 @@ TLSLOG_L( KSenServiceConnectionStatusLogChannelBase+iConnectionID, KSenServiceConnectionStatusLogLevel, "CSenConnectionStatusObserver::RunL" ); iConnectionStatusProperty.Subscribe(iStatus); - SetActive(); + if(!IsActive()) + SetActive(); iStatus = KRequestPending; TInt propertyValue(KErrNotFound); @@ -4020,7 +4062,8 @@ CActiveScheduler::Add(this); // Initial subscription iFileProgressProperty.Subscribe(iStatus); - SetActive(); + if(!IsActive()) + SetActive(); iStatus = KRequestPending; } @@ -4042,7 +4085,8 @@ { // Resubscribe before processing new value to prevent missing updates(!): iFileProgressProperty.Subscribe(iStatus); - SetActive(); + if(!IsActive()) + SetActive(); iStatus = KRequestPending; TLSLOG_L( KSenServiceConnectionStatusLogChannelBase+iConnectionID, KSenServiceConnectionStatusLogLevel, "CSenFileProgressObserver::RunL" );