Bug 1300543 - IconDownloader.downloadAndDecodeImage(): Correctly assign and close stream. r?ahunt
MozReview-Commit-ID: CYEOCCpraOr
--- a/mobile/android/base/java/org/mozilla/gecko/icons/loader/IconDownloader.java
+++ b/mobile/android/base/java/org/mozilla/gecko/icons/loader/IconDownloader.java
@@ -90,17 +90,18 @@ public class IconDownloader implements I
if (connection == null) {
return null;
}
InputStream stream = null;
// Decode the image from the fetched response.
try {
- return decodeImageFromResponse(context, connection.getInputStream(), connection.getHeaderFieldInt("Content-Length", -1));
+ stream = connection.getInputStream();
+ return decodeImageFromResponse(context, stream, connection.getHeaderFieldInt("Content-Length", -1));
} finally {
// Close the stream and free related resources.
IOUtils.safeStreamClose(stream);
connection.disconnect();
}
}
/**