--- a/bluetooth/btstack/avdtp/avdtpMuxChannel.cpp	Thu Sep 23 17:06:47 2010 +0300
+++ b/bluetooth/btstack/avdtp/avdtpMuxChannel.cpp	Wed Oct 13 16:20:29 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -163,7 +163,7 @@
 void CMuxChannel::ConstructL(TTCID aRemotelyAssignedTCID)
 	{
 	LOG_FUNC
-//	iHeartbeat = CHeartbeat::NewL()
+	
 	iMuxSendTimer = CPeriodic::NewL(EPriorityHigh);
 #ifdef HAVE_INBOUND_MUX_PACKET
 	iInboundMessage = CAvdtpInboundMuxedMessage::NewL(*this);
@@ -205,7 +205,7 @@
 CMuxChannel::~CMuxChannel()
 	{
 	LOG_FUNC
-	iMuxSendTimer->Cancel();
+	delete iMuxSendTimer;
 	iTCID.Close();
 	}
 	
@@ -435,6 +435,9 @@
 		case ERecovery:
 			array = &iRecoverySessions;
 			break;
+		default:
+			__ASSERT_DEBUG(ETrue, Panic(EAVDTPBadSessionDetachFromTransportChannel));
+			break;
 		}
 	
 #ifdef _DEBUG