修复BitmapUtils下载错误文件后,一直使用错误文件的问题.

Author: wyouflf

library/src/com/lidroid/xutils/bitmap/core/BitmapCache.java

@@ -138,7 +138,8 @@ public Bitmap downloadBitmap(String uri, BitmapDisplayConfig config, final Bitma
 
         try {
 
-            // download to disk
+            Bitmap bitmap = null;
+            // try download to disk
             if (globalConfig.isDiskCacheEnabled()) {
                 synchronized (mDiskCacheLock) {
                     // Wait for disk cache to initialize
@@ -169,6 +170,11 @@ public Bitmap downloadBitmap(String uri, BitmapDisplayConfig config, final Bitma
                             }
                             if (snapshot != null) {
                                 bitmapMeta.inputStream = snapshot.getInputStream(DISK_CACHE_INDEX);
+                                bitmap = decodeBitmapMeta(bitmapMeta, config);
+                                if (bitmap == null) {
+                                    bitmapMeta.inputStream = null;
+                                    mDiskLruCache.remove(uri);
+                                }
                             }
                         } catch (Throwable e) {
                             LogUtils.e(e.getMessage(), e);
@@ -177,20 +183,22 @@ public Bitmap downloadBitmap(String uri, BitmapDisplayConfig config, final Bitma
                 }
             }
 
-            // download to memory stream
-            if (!globalConfig.isDiskCacheEnabled() || mDiskLruCache == null || bitmapMeta.inputStream == null) {
+            // try download to memory stream
+            if (bitmap == null) {
                 outputStream = new ByteArrayOutputStream();
                 bitmapMeta.expiryTimestamp = globalConfig.getDownloader().downloadToStream(uri, outputStream, task);
                 if (bitmapMeta.expiryTimestamp < 0) {
                     return null;
                 } else {
                     bitmapMeta.data = ((ByteArrayOutputStream) outputStream).toByteArray();
+                    bitmap = decodeBitmapMeta(bitmapMeta, config);
                 }
             }
 
-            Bitmap bitmap = decodeBitmapMeta(bitmapMeta, config);
-            bitmap = rotateBitmapIfNeeded(uri, config, bitmap);
-            addBitmapToMemoryCache(uri, config, bitmap, bitmapMeta.expiryTimestamp);
+            if (bitmap != null) {
+                bitmap = rotateBitmapIfNeeded(uri, config, bitmap);
+                addBitmapToMemoryCache(uri, config, bitmap, bitmapMeta.expiryTimestamp);
+            }
             return bitmap;
         } catch (Throwable e) {
             LogUtils.e(e.getMessage(), e);