--- a/connectivity/com.nokia.tcf/native/TCFNative/TCFServer/BaseCom.cpp	Thu Jul 16 09:39:55 2009 -0500
+++ b/connectivity/com.nokia.tcf/native/TCFNative/TCFServer/BaseCom.cpp	Wed Jul 22 12:14:43 2009 -0500
@@ -23,9 +23,9 @@
 #ifdef _DEBUG
 	if (gDoLogging)
 	{
-		FILE* f = fopen("c:\\tcf\\basecommlog.txt", "at");
-		fprintf(f, "CBaseCom::CBaseCom() (default constructor)\n");
-		fclose(f);
+//		FILE* f = fopen("c:\\tcf\\basecommlog.txt", "at");
+//		fprintf(f, "CBaseCom::CBaseCom() (default constructor)\n");
+//		fclose(f);
 	}
 #endif
 	m_isConnected = false;
@@ -44,9 +44,9 @@
 #ifdef _DEBUG
 	if (gDoLogging)
 	{
-		FILE* f = fopen("c:\\tcf\\basecommlog.txt", "at");
-		fprintf(f, "connectSettings=%x connectionId=%d, protocol=%x\n", connectSettings, connectionId, protocol);
-		fclose(f);
+//		FILE* f = fopen("c:\\tcf\\basecommlog.txt", "at");
+//		fprintf(f, "connectSettings=%x connectionId=%d, protocol=%x\n", connectSettings, connectionId, protocol);
+//		fclose(f);
 	}
 #endif
 	m_isConnected = false;
@@ -63,11 +63,19 @@
 	m_ConnectSettings = new ConnectData();
 	memcpy(m_ConnectSettings, connectSettings, sizeof(ConnectData));
 
-#if (defined(LOG_COMM) || defined(LOG_PROCCOMM)) && defined(_DEBUG)
+#if defined(_DEBUG)
 	if (gDoLogging)
 	{
+#if defined(LOG_COMM)
 		m_CommDebugLog = new TCDebugLog("TCF_Comm", connectionId, 2000L);
+#else
+		m_CommDebugLog = NULL;
+#endif
+#if defined(LOG_PROCCOMM)
 		m_ProcDebugLog = new TCDebugLog("TCF_CommP", connectionId, 2000L);
+#else
+		m_ProcDebugLog = NULL;
+#endif
 	}
 #endif
 }
@@ -77,9 +85,9 @@
 #ifdef _DEBUG
 	if (gDoLogging)
 	{
-		FILE* f = fopen("c:\\tcf\\basecommlog.txt", "at");
-		fprintf(f, "CBaseCom::~CBaseCom()\n");
-		fclose(f);
+//		FILE* f = fopen("c:\\tcf\\basecommlog.txt", "at");
+//		fprintf(f, "CBaseCom::~CBaseCom()\n");
+//		fclose(f);
 	}
 #endif
 	if (m_pBuffer)