# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1265043374 0
# Node ID 23004ebfbb2dfe1164f67eec5e1488bb452b477b
# Parent  acef663c1218e750b56fec90b97cb38bc6b4ae67
Fix memory leak in harvesterserver (Bug 1631)

diff -r acef663c1218 -r 23004ebfbb2d harvester/server/src/harvesterao.cpp
--- a/harvester/server/src/harvesterao.cpp	Tue Jan 26 12:13:20 2010 +0200
+++ b/harvester/server/src/harvesterao.cpp	Mon Feb 01 16:56:14 2010 +0000
@@ -188,6 +188,7 @@
     iContainerPHArray.ResetAndDestroy();
     iContainerPHArray.Close();
 	
+    delete iHarvesterOomAO;
     delete iRestoreWatcher;
 	delete iOnDemandAO;
 	delete iMdEHarvesterSession;
diff -r acef663c1218 -r 23004ebfbb2d harvester/server/src/harvesteroomao.cpp
--- a/harvester/server/src/harvesteroomao.cpp	Tue Jan 26 12:13:20 2010 +0200
+++ b/harvester/server/src/harvesteroomao.cpp	Mon Feb 01 16:56:14 2010 +0000
@@ -49,6 +49,7 @@
 //
 CHarvesterOomAO::~CHarvesterOomAO()
 	{
+	Cancel();
 	iOomMsgQueue.Close();
 	}