update LruDiskCache

jerry870101 · Jun 20, 2014 · ac91f95 · ac91f95
1 parent 7de7f31
commit ac91f95
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/library/src/com/lidroid/xutils/bitmap/core/BitmapCache.java b/library/src/com/lidroid/xutils/bitmap/core/BitmapCache.java
@@ -39,7 +39,7 @@ public class BitmapCache {
     private LruMemoryCache<MemoryCacheKey, Bitmap> mMemoryCache;
 
     private final Object mDiskCacheLock = new Object();
-    private boolean isDiskCacheReadied = false;
+    private volatile boolean isDiskCacheReady = false;
 
     private BitmapGlobalConfig globalConfig;
 
@@ -106,8 +106,8 @@ public void initDiskCache() {
                     }
                 }
             }
-            isDiskCacheReadied = true;
             mDiskCacheLock.notifyAll();
+            isDiskCacheReady = true;
         }
     }
 
@@ -142,7 +142,7 @@ public Bitmap downloadBitmap(String uri, BitmapDisplayConfig config, final Bitma
             if (globalConfig.isDiskCacheEnabled()) {
                 synchronized (mDiskCacheLock) {
                     // Wait for disk cache to initialize
-                    while (!isDiskCacheReadied) {
+                    while (!isDiskCacheReady) {
                         try {
                             mDiskCacheLock.wait();
                         } catch (Throwable e) {
@@ -257,7 +257,7 @@ public File getBitmapFileFromDiskCache(String uri) {
     public Bitmap getBitmapFromDiskCache(String uri, BitmapDisplayConfig config) {
         if (uri == null || !globalConfig.isDiskCacheEnabled()) return null;
         synchronized (mDiskCacheLock) {
-            while (!isDiskCacheReadied) {
+            while (!isDiskCacheReady) {
                 try {
                     mDiskCacheLock.wait();
                 } catch (Throwable e) {
@@ -317,7 +317,7 @@ public void clearDiskCache() {
                     LogUtils.e(e.getMessage(), e);
                 }
                 mDiskLruCache = null;
-                isDiskCacheReadied = false;
+                isDiskCacheReady = false;
             }
         }
         initDiskCache();

diff --git a/library/src/com/lidroid/xutils/cache/LruDiskCache.java b/library/src/com/lidroid/xutils/cache/LruDiskCache.java
@@ -424,7 +424,16 @@ public synchronized long getExpiryTimestamp(String key) throws IOException {
 
     public File getCacheFile(String key, int index) {
         String diskKey = fileNameGenerator.generate(key);
-        return new File(this.directory, diskKey + "." + index);
+        File result = new File(this.directory, diskKey + "." + index);
+        if (result.exists()) {
+            return result;
+        } else {
+            try {
+                this.remove(key);
+            } catch (IOException ignore) {
+            }
+            return null;
+        }
     }
 
     public Snapshot get(String key) throws IOException {