equal
deleted
inserted
replaced
532 } |
532 } |
533 |
533 |
534 CBTManSession::~CBTManSession() |
534 CBTManSession::~CBTManSession() |
535 { |
535 { |
536 LOG_FUNC |
536 LOG_FUNC |
537 if (iMessageArray) |
537 |
538 { |
|
539 CompleteOutstandingMessages(); |
|
540 iMessageArray->ResetAndDestroy(); |
|
541 } |
|
542 delete iMessageArray; |
|
543 delete iSubSessions; |
538 delete iSubSessions; |
544 Server().DeleteContainer(iContainer); |
539 Server().DeleteContainer(iContainer); |
545 Server().DropSession(); |
540 Server().DropSession(); |
|
541 |
|
542 if (iMessageArray) |
|
543 { |
|
544 __ASSERT_DEBUG(iMessageArray->Count()== 0, PanicServer(EBTManOutstandingMessagesOnClosedSession)); |
|
545 |
|
546 CompleteOutstandingMessages(); |
|
547 iMessageArray->ResetAndDestroy(); |
|
548 } |
|
549 delete iMessageArray; |
546 } |
550 } |
547 |
551 |
548 void CBTManSession::CompleteOutstandingMessages() |
552 void CBTManSession::CompleteOutstandingMessages() |
549 /** |
553 /** |
550 Completes any messages left in the CBTManMessage array. |
554 Completes any messages left in the CBTManMessage array. |