# HG changeset patch
# User andy simpson <andrews@symbian.org>
# Date 1265637074 0
# Node ID e8c5a641faf0e1741eee6c25cd6d1ece130052e0
# Parent  b73a2e62868f3daf31ef2d7160c22f68e0263cdc# Parent  23004ebfbb2dfe1164f67eec5e1488bb452b477b
merge Bug 1631 to latest drop

diff -r b73a2e62868f -r e8c5a641faf0 harvester/server/src/harvesterao.cpp
--- a/harvester/server/src/harvesterao.cpp	Tue Feb 02 00:24:33 2010 +0200
+++ b/harvester/server/src/harvesterao.cpp	Mon Feb 08 13:51:14 2010 +0000
@@ -187,6 +187,7 @@
     iContainerPHArray.ResetAndDestroy();
     iContainerPHArray.Close();
 	
+    delete iHarvesterOomAO;
     delete iRestoreWatcher;
 	delete iOnDemandAO;
 	delete iMdEHarvesterSession;
diff -r b73a2e62868f -r e8c5a641faf0 harvester/server/src/harvesteroomao.cpp
--- a/harvester/server/src/harvesteroomao.cpp	Tue Feb 02 00:24:33 2010 +0200
+++ b/harvester/server/src/harvesteroomao.cpp	Mon Feb 08 13:51:14 2010 +0000
@@ -49,6 +49,7 @@
 //
 CHarvesterOomAO::~CHarvesterOomAO()
 	{
+	Cancel();
 	iOomMsgQueue.Close();
 	}