diff -r f23c07ec56e2 -r 85f623e1ef41 harvester/client/src/harvesterclient.cpp --- a/harvester/client/src/harvesterclient.cpp Tue Aug 31 15:37:30 2010 +0300 +++ b/harvester/client/src/harvesterclient.cpp Wed Sep 01 12:24:24 2010 +0100 @@ -183,23 +183,20 @@ delete iSessionWatcher; iSessionWatcher = NULL; - - WRITELOG( "RHarvesterClient::Close() - cancelling pending harvesting requests" ); + if( iRequestQueue && iRequestQueue->RequestsPending() ) { iRequestQueue->Cancel(); } - WRITELOG( "RHarvesterClient::Close() - removing harvester client observer" ); + // cancels Harvest Complete request if it exist at server 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" ); @@ -214,7 +211,6 @@ delete iHEO; iHEO = NULL; - WRITELOG( "RHarvesterClient::Close() - deleting harvester client AO" ); delete iHarvesterClientAO; iHarvesterClientAO = NULL; @@ -254,7 +250,6 @@ if ( iHarvesterClientAO ) { - WRITELOG( "RHarvesterClient::RemoveObserver() - calling iHarvesterClientAO->RemoveObserver" ); iHarvesterClientAO->RemoveObserver( aObserver ); }