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

2010-06-26 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net> 

Return null if written length > 0 even if SegmentEntry->cuid
	equals given cuid.
	* src/SegmentMan.cc
pull/1/head
Tatsuhiro Tsujikawa 2010-06-26 12:41:07 +00:00
parent 6a26097987
commit 8a619ab9b9
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2010-06-26 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Return null if written length > 0 even if SegmentEntry->cuid
equals given cuid.
* src/SegmentMan.cc
2010-06-26 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net> 2010-06-26 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Fixed compiler warning without bittorrent support Fixed compiler warning without bittorrent support

6
src/SegmentMan.cc
View File

@ -220,12 +220,12 @@ SharedHandle<Segment> SegmentMan::getCleanSegmentIfOwnerIsIdle
eoi = usedSegmentEntries_.end(); itr != eoi; ++itr) { eoi = usedSegmentEntries_.end(); itr != eoi; ++itr) {
const SharedHandle<SegmentEntry>& segmentEntry = *itr; const SharedHandle<SegmentEntry>& segmentEntry = *itr;
if(segmentEntry->segment->getIndex() == index) { if(segmentEntry->segment->getIndex() == index) {
if(segmentEntry->cuid == cuid) {
return segmentEntry->segment;
}
if(segmentEntry->segment->getWrittenLength() > 0) { if(segmentEntry->segment->getWrittenLength() > 0) {
return SharedHandle<Segment>(); return SharedHandle<Segment>();
} }
if(segmentEntry->cuid == cuid) {
return segmentEntry->segment;
}
cuid_t owner = segmentEntry->cuid; cuid_t owner = segmentEntry->cuid;
SharedHandle<PeerStat> ps = getPeerStat(owner); SharedHandle<PeerStat> ps = getPeerStat(owner);
if(ps.isNull() || (!ps.isNull() && ps->getStatus() == PeerStat::IDLE)) { if(ps.isNull() || (!ps.isNull() && ps->getStatus() == PeerStat::IDLE)) {