--- a/metadataengine/server/src/mdsserver.cpp Wed Sep 15 12:40:59 2010 +0300
+++ b/metadataengine/server/src/mdsserver.cpp Wed Oct 13 15:02:02 2010 +0300
@@ -489,30 +489,19 @@
iClientThread.Close();
delete iBURWatcher;
- iBURWatcher = NULL;
delete iDiskSpaceGarbageCollectorNotifier;
- iDiskSpaceGarbageCollectorNotifier = NULL;
delete iDiskFullNotifier;
- iDiskFullNotifier = NULL;
delete iManipulate;
- iManipulate = NULL;
delete iSchema;
- iSchema = NULL;
delete iNotifier;
- iNotifier = NULL;
delete iLockList;
- iLockList = NULL;
delete iMaintenance;
- iMaintenance = NULL;
delete iDefaultDBConnection;
- iDefaultDBConnection = NULL;
delete iHarvestingPrioritizationSerializationBuffer;
- iHarvestingPrioritizationSerializationBuffer = NULL;
iHarvestingPrioritizationChunk.Close();
delete iShutdownObserver;
- iShutdownObserver = NULL;
__LOGLB( ELogAlways, "Server stop" );
__DESTROY_LOGGER;
@@ -960,7 +949,6 @@
{
TRAP(result, CMdSServer::ThreadFunctionL());
delete cleanup;
- cleanup = NULL;
}
__UHEAP_MARKEND;
return result;