Fix bug JakeWharton#81: Infinite loop in trimToSize with multi-threading

la-urre · May 18, 2015 · 60a213c · 60a213c
1 parent 3aa6286
commit 60a213c
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/src/main/java/com/jakewharton/disklrucache/DiskLruCache.java b/src/main/java/com/jakewharton/disklrucache/DiskLruCache.java
@@ -646,9 +646,20 @@ public synchronized void close() throws IOException {
 
   private void trimToSize() throws IOException {
     while (size > maxSize) {
-      Map.Entry<String, Entry> toEvict = lruEntries.entrySet().iterator().next();
-      remove(toEvict.getKey());
+      if (!tryRemoveEntryFromOldest()) {
+        // cannot remove any entry (all are being edited), skip the trim
+        break;
+      }
+    }
+  }
+
+  private boolean tryRemoveEntryFromOldest() throws IOException {
+    for (Map.Entry<String, Entry> toEvict : lruEntries.entrySet()) {
+      if (remove(toEvict.getKey())) {
+        return true;
+      }
     }
+    return false;
   }
 
   /**