harvester/client/src/harvesterclient.cpp
branchRCL_3
changeset 20 f23c07ec56e2
parent 19 b73252188534
child 21 85f623e1ef41
equal deleted inserted replaced
19:b73252188534 20:f23c07ec56e2
   181     WRITELOG( "RHarvesterClient::Close()" );
   181     WRITELOG( "RHarvesterClient::Close()" );
   182     OstTrace0( TRACE_NORMAL, RHARVESTERCLIENT_CLOSE, "RHarvesterClient::Close" );
   182     OstTrace0( TRACE_NORMAL, RHARVESTERCLIENT_CLOSE, "RHarvesterClient::Close" );
   183     
   183     
   184     delete iSessionWatcher;
   184     delete iSessionWatcher;
   185     iSessionWatcher = NULL;
   185     iSessionWatcher = NULL;
   186 
   186     
       
   187     WRITELOG( "RHarvesterClient::Close() - cancelling pending harvesting requests" );
   187     if( iRequestQueue && iRequestQueue->RequestsPending() )
   188     if( iRequestQueue && iRequestQueue->RequestsPending() )
   188         {
   189         {
   189         iRequestQueue->Cancel();
   190         iRequestQueue->Cancel();
   190         }
   191         }
   191     
   192     
   192     // cancels Harvest Complete request if it exist at server
   193     WRITELOG( "RHarvesterClient::Close() - removing harvester client observer" );
   193     if( iObserver )
   194     if( iObserver )
   194         {
   195         {
   195         RemoveObserver( iObserver );
   196         RemoveObserver( iObserver );
   196         }
   197         }
       
   198     UnregisterHarvestComplete();
   197     
   199     
   198     WRITELOG( "RHarvesterClient::Close() - UnregisterHarvest done" );
   200     WRITELOG( "RHarvesterClient::Close() - UnregisterHarvest done" );
   199     
   201     
       
   202     WRITELOG( "RHarvesterClient::Close() - forcing remaining harvesting requests" );
   200     if( iRequestQueue && iRequestQueue->RequestsPending() )
   203     if( iRequestQueue && iRequestQueue->RequestsPending() )
   201         {
   204         {
   202         WRITELOG( "RHarvesterClient::Close() - Pending harvesting requests detected -> ForceHarvest" );
   205         WRITELOG( "RHarvesterClient::Close() - Pending harvesting requests detected -> ForceHarvest" );
   203         iRequestQueue->ForceRequests();
   206         iRequestQueue->ForceRequests();
   204         }
   207         }
   209     iRequestQueue = NULL;
   212     iRequestQueue = NULL;
   210     
   213     
   211     delete iHEO;
   214     delete iHEO;
   212     iHEO = NULL;
   215     iHEO = NULL;
   213     
   216     
       
   217     WRITELOG( "RHarvesterClient::Close() - deleting harvester client AO" );
   214     delete iHarvesterClientAO;
   218     delete iHarvesterClientAO;
   215     iHarvesterClientAO = NULL;
   219     iHarvesterClientAO = NULL;
   216     
   220     
   217     WRITELOG( "RHarvesterClient::Close() - Closing session" );
   221     WRITELOG( "RHarvesterClient::Close() - Closing session" );
   218     
   222     
   248 		{
   252 		{
   249 		WRITELOG( "RHarvesterClient::RemoveObserver() - deleting observer" );
   253 		WRITELOG( "RHarvesterClient::RemoveObserver() - deleting observer" );
   250 		
   254 		
   251 	    if ( iHarvesterClientAO )
   255 	    if ( iHarvesterClientAO )
   252 	        {
   256 	        {
       
   257 	        WRITELOG( "RHarvesterClient::RemoveObserver() - calling iHarvesterClientAO->RemoveObserver" );
   253 	        iHarvesterClientAO->RemoveObserver( aObserver );
   258 	        iHarvesterClientAO->RemoveObserver( aObserver );
   254 	        }
   259 	        }
   255 		
   260 		
   256 		iObserver = NULL;
   261 		iObserver = NULL;
   257 		}
   262 		}