MGR: Wizard retries acct_mgr_rpc() if acct_mgr_rpc_poll() sets ERR_RETRY

svn path=/trunk/boinc/; revision=18408
This commit is contained in:
Charlie Fenton 2009-06-13 15:10:24 +00:00
parent 0269160f8e
commit dd684da206
2 changed files with 19 additions and 2 deletions

View File

@ -5610,3 +5610,9 @@ Charlie 12 June 2009
mac_build/
boinc.xcodeproj/
project.pbxproj
Charlie 13 June 2009
- MGR: Wizard retries acct_mgr_rpc() if acct_mgr_rpc_poll() sets ERR_RETRY.
clientgui/
AccountManagerProcessingPage.cpp

View File

@ -282,11 +282,22 @@ void CAccountManagerProcessingPage::OnStateChange( CAccountManagerProcessingPage
tsExecutionTime = dtCurrentExecutionTime - dtStartExecutionTime;
iReturnValue = 0;
reply.error_num = ERR_IN_PROGRESS;
while ((!iReturnValue && (ERR_IN_PROGRESS == reply.error_num)) &&
tsExecutionTime.GetSeconds() <= 60 &&
while (!iReturnValue &&
((ERR_IN_PROGRESS == reply.error_num) ||
(ERR_RETRY == reply.error_num)) &&
(tsExecutionTime.GetSeconds() <= 60) &&
!CHECK_CLOSINGINPROGRESS()
)
{
if (ERR_RETRY == reply.error_num) {
pDoc->rpc.acct_mgr_rpc(
url.c_str(),
username.c_str(),
password.c_str(),
pWAP->m_bCredentialsCached
);
}
dtCurrentExecutionTime = wxDateTime::Now();
tsExecutionTime = dtCurrentExecutionTime - dtStartExecutionTime;
iReturnValue = pDoc->rpc.acct_mgr_rpc_poll(reply);