Close image stream outside of DiskCache,save(...)

Author: nostra13

library/src/com/nostra13/universalimageloader/cache/disc/DiscCacheAware.java

@@ -49,9 +49,10 @@ public interface DiscCacheAware {
 
 	/**
 	 * Saves image stream in disk cache.
+	 * Incoming image stream shouldn't be closed in this method.
 	 *
 	 * @param imageUri    Original image URI
-	 * @param imageStream Input stream of image
+	 * @param imageStream Input stream of image (shouldn't be closed in this method)
 	 * @param listener    Listener for saving progress, can be ignored if you don't use
 	 *                    {@linkplain com.nostra13.universalimageloader.core.listener.ImageLoadingProgressListener
 	 *                    progress listener} in ImageLoader calls

library/src/com/nostra13/universalimageloader/cache/disc/impl/BaseDiscCache.java

@@ -111,7 +111,6 @@ public boolean save(String imageUri, InputStream imageStream, IoUtils.CopyListen
 				IoUtils.closeSilently(os);
 			}
 		} finally {
-			IoUtils.closeSilently(imageStream);
 			if (loaded && !tmpFile.renameTo(imageFile)) {
 				loaded = false;
 			}

library/src/com/nostra13/universalimageloader/core/LoadAndDisplayImageTask.java

@@ -288,7 +288,11 @@ private boolean tryCacheImageOnDisk() throws TaskCancelledException {
 
 	private boolean downloadImage() throws IOException {
 		InputStream is = getDownloader().getStream(uri, options.getExtraForDownloader());
-		return configuration.diskCache.save(uri, is, this);
+		try {
+			return configuration.diskCache.save(uri, is, this);
+		} finally {
+			IoUtils.closeSilently(is);
+		}
 	}
 
 	/** Decodes image file into Bitmap, resize it and save it back */