github
/
aria2
mirror of https://github.com/aria2/aria2
1
0
Fork 0
Code Issues Releases Wiki Activity

2009-07-11 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net> 

Added assert(!req.isNull()) when DlRetryEx is caught(this is
	relatively naive approach, though).  For DownloadFailureException,
	we handle the case when req is null properly.
	* src/AbstractCommand.cc
pull/1/head
Tatsuhiro Tsujikawa 2009-07-11 10:25:45 +00:00
parent d99ec1534f
commit b29fbb9af5
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2009-07-11 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Added assert(!req.isNull()) when DlRetryEx is caught(this is
relatively naive approach, though). For DownloadFailureException,
we handle the case when req is null properly.
* src/AbstractCommand.cc
2009-07-11 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net> 2009-07-11 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Added function returning suffix of control file to Added function returning suffix of control file to

9
src/AbstractCommand.cc
View File

@ -196,7 +196,7 @@ bool AbstractCommand::execute() {
tryReserved(); tryReserved();
return true; return true;
} catch(DlRetryEx& err) { } catch(DlRetryEx& err) {
// TODO1.5 Consider the case when req is null assert(!req.isNull());
logger->info(MSG_RESTARTING_DOWNLOAD, logger->info(MSG_RESTARTING_DOWNLOAD,
DL_RETRY_EX2(StringFormat DL_RETRY_EX2(StringFormat
("URI=%s", req->getCurrentUrl().c_str()).str(),err), ("URI=%s", req->getCurrentUrl().c_str()).str(),err),
@ -217,10 +217,11 @@ bool AbstractCommand::execute() {
return prepareForRetry(getOption()->getAsInt(PREF_RETRY_WAIT)); return prepareForRetry(getOption()->getAsInt(PREF_RETRY_WAIT));
} }
} catch(DownloadFailureException& err) { } catch(DownloadFailureException& err) {
// TODO1.5 Consider the case when req is null
logger->error(EX_EXCEPTION_CAUGHT, err); logger->error(EX_EXCEPTION_CAUGHT, err);
_fileEntry->addURIResult(req->getUrl(), err.getCode()); if(!req.isNull()) {
_requestGroup->setLastUriResult(req->getUrl(), err.getCode()); _fileEntry->addURIResult(req->getUrl(), err.getCode());
_requestGroup->setLastUriResult(req->getUrl(), err.getCode());
}
_requestGroup->setHaltRequested(true); _requestGroup->setHaltRequested(true);
return true; return true;
} }