fix: 某些情况下磁盘缓存无法删除的问题

zhang3776813 · Feb 26, 2017 · d28075a · d28075a
1 parent 8f223b2
commit d28075a
Showing 1 changed file with 20 additions and 12 deletions.
diff --git a/xutils/src/main/java/org/xutils/cache/LruDiskCache.java b/xutils/src/main/java/org/xutils/cache/LruDiskCache.java
@@ -269,13 +269,17 @@ public void run() {
                             if (rmList != null && rmList.size() > 0) {
                                 // delete cache files
                                 for (DiskCacheEntity entity : rmList) {
-                                    String path = entity.getPath();
-                                    if (!TextUtils.isEmpty(path)) {
-                                        if (deleteFileWithLock(path)
-                                                && deleteFileWithLock(path + TEMP_FILE_SUFFIX)) {
-                                            // delete db entity
-                                            cacheDb.delete(entity);
+                                    try {
+                                        // delete db entity
+                                        cacheDb.delete(entity);
+                                        // delete cache files
+                                        String path = entity.getPath();
+                                        if (!TextUtils.isEmpty(path)) {
+                                            deleteFileWithLock(path);
+                                            deleteFileWithLock(path + TEMP_FILE_SUFFIX);
                                         }
+                                    } catch (DbException ex) {
+                                        LogUtil.e(ex.getMessage(), ex);
                                     }
                                 }
 
@@ -293,13 +297,17 @@ && deleteFileWithLock(path + TEMP_FILE_SUFFIX)) {
                             if (rmList != null && rmList.size() > 0) {
                                 // delete cache files
                                 for (DiskCacheEntity entity : rmList) {
-                                    String path = entity.getPath();
-                                    if (!TextUtils.isEmpty(path)) {
-                                        if (deleteFileWithLock(path)
-                                                && deleteFileWithLock(path + TEMP_FILE_SUFFIX)) {
-                                            // delete db entity
-                                            cacheDb.delete(entity);
+                                    try {
+                                        // delete db entity
+                                        cacheDb.delete(entity);
+                                        // delete cache files
+                                        String path = entity.getPath();
+                                        if (!TextUtils.isEmpty(path)) {
+                                            deleteFileWithLock(path);
+                                            deleteFileWithLock(path + TEMP_FILE_SUFFIX);
                                         }
+                                    } catch (DbException ex) {
+                                        LogUtil.e(ex.getMessage(), ex);
                                     }
                                 }
                             }