equal
deleted
inserted
replaced
2035 { |
2035 { |
2036 ipSenServiceDispatcher->ResetQueue(); |
2036 ipSenServiceDispatcher->ResetQueue(); |
2037 } |
2037 } |
2038 |
2038 |
2039 TInt cancelLeaveCode(KErrNone); |
2039 TInt cancelLeaveCode(KErrNone); |
2040 CSenAsyncOperation* pSenAO = CSenAsyncOperation::NewL(this); |
2040 TRAP(cancelLeaveCode, |
2041 TRAP(cancelLeaveCode, iConnection.CancelSession(pSenAO->iStatus)); |
2041 CSenAsyncOperation* pSenAO = CSenAsyncOperation::NewL(this); |
|
2042 iConnection.CancelSession(pSenAO->iStatus); |
|
2043 ); |
2042 #ifdef _SENDEBUG |
2044 #ifdef _SENDEBUG |
2043 if(cancelLeaveCode!=KErrNone) |
2045 if(cancelLeaveCode!=KErrNone) |
2044 { |
2046 { |
2045 TLSLOG_FORMAT((KSenServiceConnectionLogChannelBase+iConnectionID, KMinLogLevel , _L8("- CancelSession leaved: %d)"), |
2047 TLSLOG_FORMAT((KSenServiceConnectionLogChannelBase+iConnectionID, KMinLogLevel , _L8("- CancelSession leaved: %d)"), |
2046 cancelLeaveCode)); |
2048 cancelLeaveCode)); |
2400 { |
2402 { |
2401 ipSenServiceDispatcher->ResetQueue(); |
2403 ipSenServiceDispatcher->ResetQueue(); |
2402 } |
2404 } |
2403 TInt cancelLeaveCode(KErrNone); |
2405 TInt cancelLeaveCode(KErrNone); |
2404 TInt retVal(KErrNone); |
2406 TInt retVal(KErrNone); |
2405 CSenAsyncOperation* pSenAO = CSenAsyncOperation::NewL(this); |
2407 TRAP( cancelLeaveCode, |
2406 TRAP( cancelLeaveCode, iConnection.CancelSession(pSenAO->iStatus); ) |
2408 CSenAsyncOperation* pSenAO = CSenAsyncOperation::NewL(this); |
|
2409 iConnection.CancelSession(pSenAO->iStatus); |
|
2410 ); |
2407 |
2411 |
2408 if(cancelLeaveCode!=KErrNone) |
2412 if(cancelLeaveCode!=KErrNone) |
2409 { |
2413 { |
2410 TLSLOG_FORMAT((KSenServiceConnectionLogChannelBase+iConnectionID, KMinLogLevel , _L8("CancelSession() leaved with (code: %d)"), cancelLeaveCode)); |
2414 TLSLOG_FORMAT((KSenServiceConnectionLogChannelBase+iConnectionID, KMinLogLevel , _L8("CancelSession() leaved with (code: %d)"), cancelLeaveCode)); |
2411 if(retVal==KErrNone) |
2415 if(retVal==KErrNone) |
2475 return retVal; |
2479 return retVal; |
2476 } |
2480 } |
2477 |
2481 |
2478 TInt CSenServiceConnectionImpl::CancelTransaction(TInt aTransactionID) |
2482 TInt CSenServiceConnectionImpl::CancelTransaction(TInt aTransactionID) |
2479 { |
2483 { |
|
2484 TInt retVal(0); |
2480 if ( iDispatcherEnabled ) // DISPATCHER IS ENABLED |
2485 if ( iDispatcherEnabled ) // DISPATCHER IS ENABLED |
2481 { |
2486 { |
2482 TInt actualTransID = ipSenServiceDispatcher->GetActualTransactionID(&aTransactionID); |
2487 TInt actualTransID = ipSenServiceDispatcher->GetActualTransactionID(&aTransactionID); |
2483 |
2488 |
2484 if( actualTransID != KErrNotFound ) |
2489 if( actualTransID != KErrNotFound ) |
2501 pAsyncOp->Cancel(); |
2506 pAsyncOp->Cancel(); |
2502 delete pAsyncOp; |
2507 delete pAsyncOp; |
2503 pAsyncOp = NULL; |
2508 pAsyncOp = NULL; |
2504 } |
2509 } |
2505 ipSenServiceDispatcher->RemoveFromQueue(aTransactionID); |
2510 ipSenServiceDispatcher->RemoveFromQueue(aTransactionID); |
2506 DeliverResponseL(KErrSenCancelled,NULL); |
2511 TRAP(retVal, DeliverResponseL(KErrSenCancelled,NULL)); |
|
2512 if( retVal != KErrNone) |
|
2513 { |
|
2514 return retVal; |
|
2515 } |
2507 } |
2516 } |
2508 } |
2517 } |
2509 else // DISPATCHER IS DISABLED |
2518 else // DISPATCHER IS DISABLED |
2510 { |
2519 { |
2511 iConnection.CancelRequest(aTransactionID); |
2520 iConnection.CancelRequest(aTransactionID); |