From 5d29a215945d64fdf9f3485a3f45c8f57b031eda Mon Sep 17 00:00:00 2001 From: David Anderson Date: Tue, 8 Nov 2011 05:49:24 +0000 Subject: [PATCH] - client: on transient upload failure, don't do start_xfer() within PERS_FILE_XFER::transient_failure(); we're about to delete and free the FILE_XFER. The transfer will be restarted in the next poll. svn path=/trunk/boinc/; revision=24549 --- checkin_notes | 9 +++++++++ client/pers_file_xfer.cpp | 4 +--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/checkin_notes b/checkin_notes index 66ba45a5b7..6583f71448 100644 --- a/checkin_notes +++ b/checkin_notes @@ -8224,3 +8224,12 @@ Rom 7 Nov 2011 workunit_running_image.png workunit_suspended_image.png workunit_waiting_image.png + +David 7 Nov 2011 + - client: on transient upload failure, don't do start_xfer() + within PERS_FILE_XFER::transient_failure(); + we're about to delete and free the FILE_XFER. + The transfer will be restarted in the next poll. + + client/ + pers_file_xfer.cpp diff --git a/client/pers_file_xfer.cpp b/client/pers_file_xfer.cpp index 3424507b43..cced84d090 100644 --- a/client/pers_file_xfer.cpp +++ b/client/pers_file_xfer.cpp @@ -335,9 +335,7 @@ void PERS_FILE_XFER::transient_failure(int retval) { // URL_LIST& ul = fip->get_url_list(is_upload); - if (ul.get_next_url()) { - start_xfer(); - } else { + if (!ul.get_next_url()) { do_backoff(); } }