|  | @@ -32,7 +32,7 @@ bool CSATExecutor::IsTaskExist(SATParameters::STTask &task)
 | 
	
		
			
				|  |  |  	return found;
 | 
	
		
			
				|  |  |  }
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -SATParameters::STTask* CSATExecutor::IsTaskProcess()
 | 
	
		
			
				|  |  | +SATParameters::STTask* CSATExecutor::IsThereATaskInProcess()
 | 
	
		
			
				|  |  |  {
 | 
	
		
			
				|  |  |  	std::list<SATParameters::STTask>::iterator it = m_vtTask.begin();
 | 
	
		
			
				|  |  |  	for ( ; it != m_vtTask.end(); it++ )
 | 
	
	
		
			
				|  | @@ -789,13 +789,14 @@ DWORD CSATExecutor::ExecuteScriptThread(LPVOID lpVoid)
 | 
	
		
			
				|  |  |  	if ( !that ) return 0;
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  	do {
 | 
	
		
			
				|  |  | -		SATParameters::STTask *pTask = that->IsTaskProcess();
 | 
	
		
			
				|  |  | +		// 是否有任务在执行;
 | 
	
		
			
				|  |  | +		SATParameters::STTask *pTask = that->IsThereATaskInProcess();
 | 
	
		
			
				|  |  |  		if ( pTask ) {// 有任务在执行中;
 | 
	
		
			
				|  |  |  			if ( pTask->_bConcurrent ) {// 并发;
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  			}
 | 
	
		
			
				|  |  |  			else {// 串行;
 | 
	
		
			
				|  |  | -				// 查询执行中的任务是否完成或超时;
 | 
	
		
			
				|  |  | +				// 是否有脚本用例在执行;
 | 
	
		
			
				|  |  |  				SATParameters::STCase* pCase = that->IsCaseScriptProcess(pTask->Job.vtCases);
 | 
	
		
			
				|  |  |  				if ( pCase ) {
 | 
	
		
			
				|  |  |  					CScriptExecutor *pExcutor = (CScriptExecutor*)pCase->_pExcutor;
 | 
	
	
		
			
				|  | @@ -823,6 +824,8 @@ DWORD CSATExecutor::ExecuteScriptThread(LPVOID lpVoid)
 | 
	
		
			
				|  |  |  					if ( NULL == pCase ) {
 | 
	
		
			
				|  |  |  						// 没有空闲的用例可执行,说明所有用例已执行完成;
 | 
	
		
			
				|  |  |  						pTask->_nExecutionState = 2;
 | 
	
		
			
				|  |  | +						// 上报任务完成;
 | 
	
		
			
				|  |  | +						that->ReportTaskFinish(pTask);
 | 
	
		
			
				|  |  |  						// 上报任务结果;
 | 
	
		
			
				|  |  |  						that->UploadTaskLog(pTask);
 | 
	
		
			
				|  |  |  					}
 |