mcy
/
owlps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[Positioner] Input: test the request earlier 

Return before to update the current time if the request is empty.
This commit is contained in:
Matteo Cypriani 2012-06-08 18:23:14 +02:00
parent 85c955bb03
commit 167cc1fcb6
1 changed files with 41 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
owlps-positioner/src/input.cc
View File

@ -119,11 +119,15 @@ void Input::initialise_log_csv()
const Request& Input::get_next_request() const
{
if (! eof())
{
if (eof())
return medium->get_current_request() ;
const Request& request = medium->get_next_request() ;
log_current_request() ;
if (! request)
return medium->get_current_request() ;
/* Update the current time */
if (Configuration::is_configured("replay"))
Timestamp::update_current_time(request.get_time_sent()) ;
@ -135,11 +139,9 @@ const Request& Input::get_next_request() const
if (cr_timeout > 0)
Stock::delete_calibration_requests_older_than(cr_timeout) ;
/* If the request is a calibration request, add it to the Stock
* (if allowed, and if it is not empty) */
/* If the request is a calibration request, add it to the Stock */
if (Configuration::bool_value(
"positioning.accept-new-calibration-requests")
&& request)
"positioning.accept-new-calibration-requests"))
{
CalibrationRequest *calibration_request =
dynamic_cast<CalibrationRequest*>(
@ -165,7 +167,6 @@ const Request& Input::get_next_request() const
medium->clear_current_request() ;
}
}
}
return medium->get_current_request() ;
}