Merge: Tolerate cache files being removed from underneath DiskLruCache

src/main/java/libcore/io/DiskLruCache.java

@@ -453,9 +453,16 @@ private synchronized void completeEdit(Editor editor, boolean success) throws IO
         // if this edit is creating the entry for the first time, every index must have a value
         if (success && !entry.readable) {
             for (int i = 0; i < valueCount; i++) {
+                if (!editor.written[i]) {
+                    editor.abort();
+                    throw new IllegalStateException(
+                            "Newly created entry didn't create value for index " + i);
+                }
                 if (!entry.getDirtyFile(i).exists()) {
                     editor.abort();
-                    throw new IllegalStateException("edit didn't create file " + i);
+                    Libcore.logW(
+                            "DiskLruCache: Newly created entry doesn't have file for index " + i);
+                    return;
                 }
             }
         }
@@ -654,10 +661,12 @@ public String getString(int index) throws IOException {
      */
     public final class Editor {
         private final Entry entry;
+        private final boolean[] written;
         private boolean hasErrors;
 
         private Editor(Entry entry) {
             this.entry = entry;
+            this.written = (entry.readable) ? null : new boolean[valueCount];
         }
 
         /**
@@ -697,6 +706,9 @@ public OutputStream newOutputStream(int index) throws IOException {
                 if (entry.currentEditor != this) {
                     throw new IllegalStateException();
                 }
+                if (!entry.readable) {
+                    written[index] = true;
+                }
                 return new FaultHidingOutputStream(new FileOutputStream(entry.getDirtyFile(index)));
             }
         }

src/main/java/libcore/net/http/HttpResponseCache.java

@@ -425,7 +425,7 @@ public Entry(URI uri, RawHeaders varyHeaders, OkHttpConnection httpConnection) {
         }
 
         public void writeTo(DiskLruCache.Editor editor) throws IOException {
-            OutputStream out = editor.newOutputStream(0);
+            OutputStream out = editor.newOutputStream(ENTRY_METADATA);
             Writer writer = new BufferedWriter(new OutputStreamWriter(out, Charsets.UTF_8));
 
             writer.write(uri + '\n');