metadataengine/server/src/mdsserver.cpp
branchRCL_3
changeset 63 e538444823de
parent 47 b73252188534
equal deleted inserted replaced
57:2872ae438bf7 63:e538444823de
   487     {
   487     {
   488     iShutdown = ETrue;
   488     iShutdown = ETrue;
   489     iClientThread.Close();
   489     iClientThread.Close();
   490     
   490     
   491 	delete iBURWatcher;
   491 	delete iBURWatcher;
   492 	iBURWatcher = NULL;
       
   493 	delete iDiskSpaceGarbageCollectorNotifier;
   492 	delete iDiskSpaceGarbageCollectorNotifier;
   494 	iDiskSpaceGarbageCollectorNotifier = NULL;
       
   495 	delete iDiskFullNotifier;
   493 	delete iDiskFullNotifier;
   496 	iDiskFullNotifier = NULL;
       
   497     delete iManipulate;
   494     delete iManipulate;
   498     iManipulate = NULL;
       
   499     delete iSchema;
   495     delete iSchema;
   500     iSchema = NULL;
       
   501     delete iNotifier;
   496     delete iNotifier;
   502     iNotifier = NULL;
       
   503     delete iLockList;
   497     delete iLockList;
   504     iLockList = NULL;
       
   505     delete iMaintenance;
   498     delete iMaintenance;
   506     iMaintenance = NULL;
       
   507     delete iDefaultDBConnection;
   499     delete iDefaultDBConnection;
   508     iDefaultDBConnection = NULL;
       
   509 
   500 
   510     delete iHarvestingPrioritizationSerializationBuffer;
   501     delete iHarvestingPrioritizationSerializationBuffer;
   511     iHarvestingPrioritizationSerializationBuffer = NULL;
       
   512 	iHarvestingPrioritizationChunk.Close();
   502 	iHarvestingPrioritizationChunk.Close();
   513 	
   503 	
   514 	delete iShutdownObserver;
   504 	delete iShutdownObserver;
   515 	iShutdownObserver = NULL;
       
   516 
   505 
   517     __LOGLB( ELogAlways, "Server stop" );
   506     __LOGLB( ELogAlways, "Server stop" );
   518     __DESTROY_LOGGER;
   507     __DESTROY_LOGGER;
   519     }
   508     }
   520 
   509 
   958  	TInt result = KErrNoMemory;
   947  	TInt result = KErrNoMemory;
   959  	if (cleanup)
   948  	if (cleanup)
   960  		{
   949  		{
   961  		TRAP(result, CMdSServer::ThreadFunctionL());
   950  		TRAP(result, CMdSServer::ThreadFunctionL());
   962 		delete cleanup;
   951 		delete cleanup;
   963 		cleanup = NULL;
       
   964  		}
   952  		}
   965     __UHEAP_MARKEND;
   953     __UHEAP_MARKEND;
   966  	return result;
   954  	return result;
   967     }
   955     }
   968     
   956