*** empty log message ***

svn path=/trunk/boinc/; revision=5297

checkin_notes

@@ -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

client/client_types.C

@@ -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;
+        urls.push_back(new_info.urls[i]);
-        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]);
-        }
     }
     return 0;
 }