harvester/client/src/harvesterclient.cpp
branchRCL_3
changeset 20 f23c07ec56e2
parent 19 b73252188534
child 21 85f623e1ef41
--- a/harvester/client/src/harvesterclient.cpp	Thu Aug 19 10:20:41 2010 +0300
+++ b/harvester/client/src/harvesterclient.cpp	Tue Aug 31 15:37:30 2010 +0300
@@ -183,20 +183,23 @@
     
     delete iSessionWatcher;
     iSessionWatcher = NULL;
-
+    
+    WRITELOG( "RHarvesterClient::Close() - cancelling pending harvesting requests" );
     if( iRequestQueue && iRequestQueue->RequestsPending() )
         {
         iRequestQueue->Cancel();
         }
     
-    // cancels Harvest Complete request if it exist at server
+    WRITELOG( "RHarvesterClient::Close() - removing harvester client observer" );
     if( iObserver )
         {
         RemoveObserver( iObserver );
         }
+    UnregisterHarvestComplete();
     
     WRITELOG( "RHarvesterClient::Close() - UnregisterHarvest done" );
     
+    WRITELOG( "RHarvesterClient::Close() - forcing remaining harvesting requests" );
     if( iRequestQueue && iRequestQueue->RequestsPending() )
         {
         WRITELOG( "RHarvesterClient::Close() - Pending harvesting requests detected -> ForceHarvest" );
@@ -211,6 +214,7 @@
     delete iHEO;
     iHEO = NULL;
     
+    WRITELOG( "RHarvesterClient::Close() - deleting harvester client AO" );
     delete iHarvesterClientAO;
     iHarvesterClientAO = NULL;
     
@@ -250,6 +254,7 @@
 		
 	    if ( iHarvesterClientAO )
 	        {
+	        WRITELOG( "RHarvesterClient::RemoveObserver() - calling iHarvesterClientAO->RemoveObserver" );
 	        iHarvesterClientAO->RemoveObserver( aObserver );
 	        }