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