Castopod
/
AntennaPod
mirror of https://github.com/AntennaPod/AntennaPod.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Flush BufferedOutputStream correctly 

This ensures that IOException due to writes are thrown in the main
code path instead of the exceptional code path.  Specifically for
HttpDownloader this ensures that IOUtils.closeQuietly does not swallow
a failed write.
This commit is contained in:
Andrew Gaul 2013-06-30 22:11:50 -07:00
parent 62961d6594
commit 07e64d8ded
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/de/danoeh/antennapod/service/download/HttpDownloader.java
View File

@ -63,7 +63,7 @@ public class HttpDownloader extends Downloader {
@Override
protected void download() {
DefaultHttpClient httpClient = null;
OutputStream out = null;
BufferedOutputStream out = null;
InputStream connection = null;
try {
HttpGet httpGet = new HttpGet(status.getFeedFile()
@ -113,6 +113,7 @@ public class HttpDownloader extends Downloader {
if (cancelled) {
onCancelled();
} else {
out.flush();
onSuccess();
}
} else {

3
tests/src/de/danoeh/antennapod/test/FeedHandlerTest.java
View File

@ -54,7 +54,7 @@ public class FeedHandlerTest extends AndroidTestCase {
for (int i = 0; i < num_retries; i++) {
InputStream in = null;
OutputStream out = null;
BufferedOutputStream out = null;
try {
in = getInputStream(feed.getDownload_url());
assertNotNull(in);
@ -65,6 +65,7 @@ public class FeedHandlerTest extends AndroidTestCase {
while ((count = in.read(buffer)) != -1) {
out.write(buffer, 0, count);
}
out.flush();
successful = true;
} catch (IOException e) {
e.printStackTrace();