# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1279212936 -10800
# Node ID 14e240312f6fe7624b8216a620f20ae68c460f35
# Parent  1f10b9300be686a464dc6fea924342a9241e4bfd
Revision: 201025
Kit: 2010127

diff -r 1f10b9300be6 -r 14e240312f6f atext/client/src/atextclient.cpp
--- a/atext/client/src/atextclient.cpp	Wed Jun 09 10:55:02 2010 +0300
+++ b/atext/client/src/atextclient.cpp	Thu Jul 15 19:55:36 2010 +0300
@@ -274,6 +274,7 @@
 EXPORT_C TInt RATExt::CancelReceiveEcomPluginChange()
     {
     TRACE_FUNC_ENTRY
+    TRACE_INFO((_L("CancelReceiveEcomPluginChange, Thread ID %Lu"), RThread().Id().Id()))
     if ( !Handle() )
         {
         TRACE_FUNC_EXIT
diff -r 1f10b9300be6 -r 14e240312f6f atext/server/src/atextsession.cpp
--- a/atext/server/src/atextsession.cpp	Wed Jun 09 10:55:02 2010 +0300
+++ b/atext/server/src/atextsession.cpp	Thu Jul 15 19:55:36 2010 +0300
@@ -898,6 +898,7 @@
     if ( iEComSession )
         {
         iEComSession->Close();
+        iEComSession = NULL; 
         }
     if ( !aSyncClose )
         {
diff -r 1f10b9300be6 -r 14e240312f6f bluetooth/btlogger/btsnoophcilogger/src/hciloggerbtsnoop.cpp
--- a/bluetooth/btlogger/btsnoophcilogger/src/hciloggerbtsnoop.cpp	Wed Jun 09 10:55:02 2010 +0300
+++ b/bluetooth/btlogger/btsnoophcilogger/src/hciloggerbtsnoop.cpp	Thu Jul 15 19:55:36 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-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"
@@ -66,14 +66,15 @@
 	for (TInt i = 0; i <= TInt(KHCILoggerControllerToHost | KHCILoggerCommandOrEvent); i++)
 		{
 		CHCILoggerBufferedFrame* temp = new(ELeave) CHCILoggerBufferedFrame;
-		iBuffers.Append(temp); // array now "owns" temp
+		CleanupStack::PushL(temp);
+		iBuffers.AppendL(temp); // array now "owns" temp
+		CleanupStack::Pop(temp);
 		}
 	}
 
 void CHCILoggerBtSnoop::DoInitialise(TInt aType)
 	{
 	iDatalinkType = aType;
-	iFs.Connect();
 	OpenFile(); // if it fails, just ignore it - try later when writing
 	}
 
@@ -149,7 +150,18 @@
 		break;
 		};
 
-	TInt err = iLogFile.Open(iFs, fileName, EFileWrite | EFileShareAny);
+	TInt err = KErrNone;
+
+	if (!iFs.Handle())
+	    {
+        err = iFs.Connect();
+        if (err)
+            {
+            return err;
+            }
+	    }
+
+	err = iLogFile.Open(iFs, fileName, EFileWrite | EFileShareAny);
 	if (err == KErrNotFound)
 		{ // if it doesn't already exist, create it
 		//Note that the potential KErrPathNotFound error is deliberately not handled, 
diff -r 1f10b9300be6 -r 14e240312f6f bluetoothcommsprofiles/btpan/panagt/panagtremdev.cpp
--- a/bluetoothcommsprofiles/btpan/panagt/panagtremdev.cpp	Wed Jun 09 10:55:02 2010 +0300
+++ b/bluetoothcommsprofiles/btpan/panagt/panagtremdev.cpp	Thu Jul 15 19:55:36 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-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"
@@ -93,7 +93,7 @@
 	{
 	iRemSockAddr.SetBTAddr(aRemDevAddr);
 	iRemSockAddr.SetPort(KBnepPsm);
-	iSockServ.Connect();
+	User::LeaveIfError(iSockServ.Connect());
 	
 #ifdef __FLOG_ACTIVE
 	TBuf<KMaxBtAddrSize> tempDevAddrBuf;
@@ -138,7 +138,7 @@
 
 	// make a note of the remote device address
 	iSocket.RemoteName(iRemSockAddr);
-	iSockServ.Connect();
+	User::LeaveIfError(iSockServ.Connect());
 
 #ifdef __FLOG_ACTIVE
 	TBuf<KMaxBtAddrSize> tempDevAddrBuf;
diff -r 1f10b9300be6 -r 14e240312f6f bluetoothmgmt/btmgr/BTManServer/BTManServer.cpp
--- a/bluetoothmgmt/btmgr/BTManServer/BTManServer.cpp	Wed Jun 09 10:55:02 2010 +0300
+++ b/bluetoothmgmt/btmgr/BTManServer/BTManServer.cpp	Thu Jul 15 19:55:36 2010 +0300
@@ -534,15 +534,19 @@
 CBTManSession::~CBTManSession()
 	{
 	LOG_FUNC
+	
+	delete iSubSessions;
+	Server().DeleteContainer(iContainer);
+	Server().DropSession();
+	
 	if (iMessageArray)
 		{
+		__ASSERT_DEBUG(iMessageArray->Count()== 0, PanicServer(EBTManOutstandingMessagesOnClosedSession));
+	
 		CompleteOutstandingMessages();
 		iMessageArray->ResetAndDestroy();
 		}
 	delete iMessageArray;
-	delete iSubSessions;
-	Server().DeleteContainer(iContainer);
-	Server().DropSession();
 	}
 
 void CBTManSession::CompleteOutstandingMessages()
diff -r 1f10b9300be6 -r 14e240312f6f bluetoothmgmt/btmgr/Inc/BTManServer.h
--- a/bluetoothmgmt/btmgr/Inc/BTManServer.h	Wed Jun 09 10:55:02 2010 +0300
+++ b/bluetoothmgmt/btmgr/Inc/BTManServer.h	Thu Jul 15 19:55:36 2010 +0300
@@ -362,6 +362,7 @@
 	EBTManClientShouldBeBusy,
 	EBTManBadState,
 	EBTManUnexpectedDbError,
+	EBTManOutstandingMessagesOnClosedSession,
 	};