--- a/syncmlfw/ds/netmon/src/CNetMon.cpp Tue Sep 14 22:54:36 2010 +0300
+++ b/syncmlfw/ds/netmon/src/CNetMon.cpp Wed Sep 15 13:08:27 2010 +0300
@@ -106,6 +106,8 @@
{
DBG_FILE(_S8("CNetMon::~CNetMon() begins"));
+ Cancel();
+
DBG_FILE(_S8("CNetMon::~CNetMon() ends"));
}
@@ -176,12 +178,7 @@
//CancelTimer();
- // Un-register for events
- iConnectionMonitor.CancelNotifications();
- iConnectionMonitor.Close();
-
- // Cleanup sync session
- CloseSyncSession();
+ Complete();
DBG_FILE(_S8("CNetMon::DoCancel() ends"));
}
@@ -510,7 +507,12 @@
{
DBG_FILE(_S8("CNetMon::Complete() begins"));
- Cancel();
+ // Un-register for events
+ iConnectionMonitor.CancelNotifications();
+ iConnectionMonitor.Close();
+
+ // Cleanup sync session
+ CloseSyncSession();
// Close the server
CActiveScheduler::Stop();