harvester/server/src/harvesterqueue.cpp
changeset 1 acef663c1218
parent 0 c53acadfccc6
child 2 b73a2e62868f
--- a/harvester/server/src/harvesterqueue.cpp	Mon Jan 18 20:34:07 2010 +0200
+++ b/harvester/server/src/harvesterqueue.cpp	Tue Jan 26 12:13:20 2010 +0200
@@ -148,11 +148,11 @@
             WRITELOG( "CHarvesterQueue::Append() - found a blacklisted file" );
             delete aItem;
             aItem = NULL;
-            err = KErrCorrupt;
+            return;
             }
         }
 
-    if ( err != KErrCorrupt )
+    if ( err == KErrNone )
         {
 		// check if fast harvest file and add to start of queue
     	if ( aItem->ObjectType() == EFastHarvest || aItem->Origin() == MdeConstants::Object::ECamera )
@@ -168,14 +168,9 @@
 			{
 			delete aItem;
 			aItem = NULL;
+			return;
 			}
         }
-
-    if ( err != KErrNone )
-        {
-        WRITELOG1( "CHarvesterQueue::Append() - error: %d", err );
-        delete aItem;
-        }
     }
 
 // ---------------------------------------------------------------------------
@@ -253,9 +248,5 @@
     	{
     	MonitorEvent( aHarvesterDataArray[i] );
     	}
-    
-    // "clear" array after ownership of items
-    // was changed for MonitorEvent-method
-    aHarvesterDataArray.Reset();
     }