Bug 1300543 - IconDownloader.downloadAndDecodeImage(): Correctly assign and close stream. r?ahunt draft
authorSebastian Kaspari <s.kaspari@gmail.com>
Tue, 06 Sep 2016 13:53:02 +0200
changeset 410348 d4192e5a2dbbb6d2aa785abece24357a498b6188
parent 410347 fc158844f751628f47105974748577f9bbb4835c
child 410349 87afcb0992738422501d90984714e16ef5407bad
push id28724
push users.kaspari@gmail.com
push dateTue, 06 Sep 2016 17:27:18 +0000
reviewersahunt
bugs1300543
milestone51.0a1
Bug 1300543 - IconDownloader.downloadAndDecodeImage(): Correctly assign and close stream. r?ahunt MozReview-Commit-ID: CYEOCCpraOr
mobile/android/base/java/org/mozilla/gecko/icons/loader/IconDownloader.java
--- 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();
         }
     }
 
     /**