equal
deleted
inserted
replaced
166 } |
166 } |
167 resHandler->iNext = iFirst; |
167 resHandler->iNext = iFirst; |
168 iFirst = resHandler; |
168 iFirst = resHandler; |
169 |
169 |
170 CActiveScheduler::Add(resHandler); |
170 CActiveScheduler::Add(resHandler); |
171 resHandler->SetActive(); |
171 if(!resHandler->IsActive()) |
|
172 resHandler->SetActive(); |
172 resHandler->iStatus = KRequestPending; |
173 resHandler->iStatus = KRequestPending; |
173 |
174 |
174 TIpcArgs args(&resHandler->iProgressData, resHandler->iSoapOrCid); |
175 TIpcArgs args(&resHandler->iProgressData, resHandler->iSoapOrCid); |
175 SendReceive(ESenCliServTransferProgress, args, resHandler->iStatus); |
176 SendReceive(ESenCliServTransferProgress, args, resHandler->iStatus); |
176 } |
177 } |
359 { |
360 { |
360 } |
361 } |
361 |
362 |
362 void CSenConnAgentSync::Start() |
363 void CSenConnAgentSync::Start() |
363 { |
364 { |
364 SetActive(); |
365 if(!IsActive()) |
|
366 SetActive(); |
365 } |
367 } |
366 |
368 |
367 CSenClientSession* CSenClientSession::NewL(MSenServiceManager& aServer, CSenServerContext& aCtx) |
369 CSenClientSession* CSenClientSession::NewL(MSenServiceManager& aServer, CSenServerContext& aCtx) |
368 { |
370 { |
369 CSenClientSession* self = CSenClientSession::NewLC(aServer, aCtx); |
371 CSenClientSession* self = CSenClientSession::NewLC(aServer, aCtx); |
4246 { |
4248 { |
4247 TInt* pTxnId = txnIds[i]; |
4249 TInt* pTxnId = txnIds[i]; |
4248 TInt cancelledTxnId(*pTxnId); |
4250 TInt cancelledTxnId(*pTxnId); |
4249 txnIds.Remove(i); |
4251 txnIds.Remove(i); |
4250 delete pTxnId; |
4252 delete pTxnId; |
|
4253 pTxnId = NULL; |
4251 CSLOG_FORMAT((iConnectionID, KNormalLogLevel , _L8("- Now processing txn with id %d"), cancelledTxnId)); |
4254 CSLOG_FORMAT((iConnectionID, KNormalLogLevel , _L8("- Now processing txn with id %d"), cancelledTxnId)); |
4252 |
4255 |
4253 |
4256 |
4254 // Attempt to cancel the actual activity on the transport layer. |
4257 // Attempt to cancel the actual activity on the transport layer. |
4255 // Note that even if transport will not cancel this transaction, |
4258 // Note that even if transport will not cancel this transaction, |