修复移除可能导致图片磁盘缓存初始化失败的问题

tadakatsu · Oct 19, 2014 · 9929936 · 9929936
1 parent a9b71b7
commit 9929936
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 15 deletions.
diff --git a/library/src/com/lidroid/xutils/BitmapUtils.java b/library/src/com/lidroid/xutils/BitmapUtils.java
@@ -218,6 +218,11 @@ public <T extends View> void display(T container, String uri, BitmapDisplayConfi
             return;
         }
 
+        if (TextUtils.isEmpty(uri)) {
+            callBack.onLoadFailed(container, uri, displayConfig.getLoadFailedDrawable());
+            return;
+        }
+
         container.clearAnimation();
 
         if (callBack == null) {
@@ -234,11 +239,6 @@ public <T extends View> void display(T container, String uri, BitmapDisplayConfi
 
         callBack.onPreLoad(container, uri, displayConfig);
 
-        if (TextUtils.isEmpty(uri)) {
-            callBack.onLoadFailed(container, uri, displayConfig.getLoadFailedDrawable());
-            return;
-        }
-
         // find bitmap from mem cache.
         Bitmap bitmap = globalConfig.getBitmapCache().getBitmapFromMemCache(uri, displayConfig);
 

diff --git a/library/src/com/lidroid/xutils/bitmap/BitmapGlobalConfig.java b/library/src/com/lidroid/xutils/bitmap/BitmapGlobalConfig.java
@@ -75,7 +75,7 @@ private BitmapGlobalConfig(Context context, String diskCachePath) {
         initBitmapCache();
     }
 
-    public static BitmapGlobalConfig getInstance(Context context, String diskCachePath) {
+    public synchronized static BitmapGlobalConfig getInstance(Context context, String diskCachePath) {
 
         if (TextUtils.isEmpty(diskCachePath)) {
             diskCachePath = OtherUtils.getDiskCacheDir(context, "xBitmapCache");

diff --git a/library/src/com/lidroid/xutils/bitmap/core/BitmapCache.java b/library/src/com/lidroid/xutils/bitmap/core/BitmapCache.java
@@ -137,17 +137,11 @@ public Bitmap downloadBitmap(String uri, BitmapDisplayConfig config, final Bitma
 
         try {
             Bitmap bitmap = null;
+
             // try download to disk
             if (globalConfig.isDiskCacheEnabled()) {
-                synchronized (mDiskCacheLock) {
-                    // Wait for disk cache to initialize
-                    while (!isDiskCacheReady) {
-                        try {
-                            mDiskCacheLock.wait();
-                        } catch (Throwable e) {
-                            break;
-                        }
-                    }
+                if (mDiskLruCache == null) {
+                    initDiskCache();
                 }
 
                 if (mDiskLruCache != null) {
@@ -319,6 +313,7 @@ public void clearDiskCache() {
             if (mDiskLruCache != null && !mDiskLruCache.isClosed()) {
                 try {
                     mDiskLruCache.delete();
+                    mDiskLruCache.close();
                 } catch (Throwable e) {
                     LogUtils.e(e.getMessage(), e);
                 }