*** empty log message ***

svn path=/trunk/boinc/; revision=5297
This commit is contained in:
David Anderson 2005-02-03 18:31:44 +00:00
parent c62fdbcced
commit b93eb75fa2
2 changed files with 12 additions and 10 deletions

View File

@ -23901,3 +23901,10 @@ Bruce 3 Feb 2005
client/
http.C
David 3 Feb 2005
- when get a FILE_INFO in a scheduler RPC reply,
replace the current list of URLs
with the list in the scheduler reply
client/
client_types.C

View File

@ -756,17 +756,12 @@ int FILE_INFO::merge_info(FILE_INFO& new_info) {
sprintf(buf, " <max_nbytes>%.0f</max_nbytes>\n", new_info.max_nbytes);
strcat(signed_xml, buf);
}
// replace existing URLs with new ones
//
urls.clear();
for (i=0; i<new_info.urls.size(); i++) {
has_url = false;
for (j=0; j<urls.size(); j++) {
if (!strcmp(urls[j].text, new_info.urls[i].text)) {
has_url = true;
break;
}
}
if (!has_url) {
urls.push_back(new_info.urls[i]);
}
urls.push_back(new_info.urls[i]);
}
return 0;
}