--- a/harvester/monitorplugins/fileplugin/src/FolderRenamer.cpp	Wed Sep 15 12:40:59 2010 +0300
+++ b/harvester/monitorplugins/fileplugin/src/FolderRenamer.cpp	Wed Oct 13 15:02:02 2010 +0300
@@ -38,9 +38,7 @@
 CRenameItem::~CRenameItem()
 	{
 	delete iOldName;
-	iOldName = NULL;
 	delete iNewName;
-	iNewName = NULL;
 	iFileEvents.ResetAndDestroy();
 	}
 	
@@ -65,14 +63,9 @@
 	{
 	TMdsFSPStatus* event = NULL;
 	event = new TMdsFSPStatus(aEvent);
-	
 	if (event)
 		{
-		if(iFileEvents.Append(event) != KErrNone)
-		    {
-            delete event;
-            event = NULL;
-		    }
+		iFileEvents.Append(event);
 		}
 	}
 
@@ -164,10 +157,7 @@
 			iRenamedFolders.Remove(0);
 			TRAP_IGNORE(currItem->HandleFileEventsL(iCFileEventHandlerAO));
 			delete currItem;
-			currItem = NULL;
-			
 			SetNextRequest(ERenameStateIdle);
-			
 			if (iRenamedFolders.Count() == 0)
 				{
 				iIsRunning = EFalse;