Issue nostra13#1026 - Check markSupported()

ronggh · Jul 2, 2015 · 3acca4a · 3acca4a
1 parent a91f2f3
commit 3acca4a
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/library/src/main/java/com/nostra13/universalimageloader/core/decode/BaseImageDecoder.java b/library/src/main/java/com/nostra13/universalimageloader/core/decode/BaseImageDecoder.java
@@ -174,13 +174,15 @@ protected Options prepareDecodingOptions(ImageSize imageSize, ImageDecodingInfo
 	}
 
 	protected InputStream resetStream(InputStream imageStream, ImageDecodingInfo decodingInfo) throws IOException {
-		try {
-			imageStream.reset();
-		} catch (IOException e) {
-			IoUtils.closeSilently(imageStream);
-			imageStream = getImageStream(decodingInfo);
+		if (imageStream.markSupported()) {
+			try {
+				imageStream.reset();
+				return imageStream;
+			} catch (IOException ignored) {
+			}
 		}
-		return imageStream;
+		IoUtils.closeSilently(imageStream);
+		return getImageStream(decodingInfo);
 	}
 
 	protected Bitmap considerExactScaleAndOrientatiton(Bitmap subsampledBitmap, ImageDecodingInfo decodingInfo,
@@ -247,4 +249,4 @@ protected ImageFileInfo(ImageSize imageSize, ExifInfo exif) {
 			this.exif = exif;
 		}
 	}
-}
+}