lbt/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* EepGet:

Browse Source 
- Fix error output bug
    - Output error data for 504 too
This commit is contained in:
zzz
2011-07-01 11:04:09 +00:00
parent 5ae41521a0
commit bf832a407e
1 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
core/java/src/net/i2p/util/EepGet.java
View File

@ -703,7 +703,7 @@ public class EepGet {
case 409: // bad addr helper
case 503: // no outproxy
_transferFailed = true;
if (_alreadyTransferred == 0 && !_shouldWriteErrorToOutput) {
if (_alreadyTransferred > 0 || !_shouldWriteErrorToOutput) {
_keepFetching = false;
return;
}
@ -718,7 +718,7 @@ public class EepGet {
break;
case 416: // completed (or range out of reach)
_bytesRemaining = 0;
if (_alreadyTransferred == 0 && !_shouldWriteErrorToOutput) {
if (_alreadyTransferred > 0 || !_shouldWriteErrorToOutput) {
_keepFetching = false;
return;
}
@ -732,10 +732,24 @@ public class EepGet {
}
break;
case 504: // gateway timeout
// throw out of doFetch() to fetch() and try again
throw new IOException("HTTP Proxy timeout");
if (_alreadyTransferred > 0 || (!_shouldWriteErrorToOutput) ||
_currentAttempt < _numRetries) {
// throw out of doFetch() to fetch() and try again
// why throw???
throw new IOException("HTTP Proxy timeout");
}
// output the error data to the stream
rcOk = true;
if (_out == null) {
if (_outputStream != null)
_out = _outputStream;
else
_out = new FileOutputStream(_outputFile, true);
}
_transferFailed = true;
break;
default:
if (_alreadyTransferred == 0 && !_shouldWriteErrorToOutput) {
if (_alreadyTransferred > 0 || !_shouldWriteErrorToOutput) {
_keepFetching = false;
} else {
// output the error data to the stream