Close dangling snapshots and streams in ResponseCacheMiddleware.

Change-Id: Ibf3ba8e1e35b6a2926ec55c6781debda949c29ae

Author: koush

AndroidAsync/src/com/koushikdutta/async/Util.java

@@ -183,13 +183,13 @@ public static void writeAll(DataSink sink, byte[] bytes, CompletedCallback callb
         writeAll(sink, bbl, callback);
     }
 
-    public static AsyncSocket getWrappedSocket(AsyncSocket socket, Class wrappedClass) {
+    public static <T extends AsyncSocket> T getWrappedSocket(AsyncSocket socket, Class<T> wrappedClass) {
         if (wrappedClass.isInstance(socket))
-            return socket;
+            return (T)socket;
         while (socket instanceof AsyncSocketWrapper) {
             socket = ((AsyncSocketWrapper)socket).getSocket();
             if (wrappedClass.isInstance(socket))
-                return socket;
+                return (T)socket;
         }
         return null;
     }

AndroidAsync/src/com/koushikdutta/async/http/ResponseCacheMiddleware.java

@@ -251,6 +251,7 @@ public AsyncServer getServer() {
     }
 
     public static class CacheData implements Parcelable {
+        DiskLruCache.Snapshot snapshot;
         CacheResponse candidate;
         long contentLength;
         ResponseHeaders cachedResponseHeaders;
@@ -278,7 +279,7 @@ public Cancellable getSocket(final GetSocketData data) {
         }
 
         String key = uriToKey(data.request.getUri());
-        DiskLruCache.Snapshot snapshot;
+        DiskLruCache.Snapshot snapshot = null;
         Entry entry;
         try {
             snapshot = cache.get(key);
@@ -299,7 +300,7 @@ public Cancellable getSocket(final GetSocketData data) {
             snapshot.close();
             return null;
         }
-        
+
         CacheResponse candidate = entry.isHttps() ? new EntrySecureCacheResponse(entry, snapshot) : new EntryCacheResponse(entry, snapshot);
 
         Map<String, List<String>> responseHeadersMap;
@@ -310,6 +311,7 @@ public Cancellable getSocket(final GetSocketData data) {
         }
         catch (Exception e) {
             networkCount++;
+            snapshot.close();
             return null;
         }
         if (responseHeadersMap == null || cachedResponseBody == null) {
@@ -319,6 +321,7 @@ public Cancellable getSocket(final GetSocketData data) {
             catch (Exception e) {
             }
             networkCount++;
+            snapshot.close();
             return null;
         }
 
@@ -351,6 +354,7 @@ public void run() {
         else if (responseSource == ResponseSource.CONDITIONAL_CACHE) {
             data.request.logi("Response may be served from conditional cache");
             CacheData cacheData = new CacheData();
+            cacheData.snapshot = snapshot;
             cacheData.contentLength = contentLength;
             cacheData.cachedResponseHeaders = cachedResponseHeaders;
             cacheData.candidate = candidate;
@@ -367,6 +371,7 @@ else if (responseSource == ResponseSource.CONDITIONAL_CACHE) {
             catch (Exception e) {
             }
             networkCount++;
+            snapshot.close();
             return null;
         }
     }
@@ -567,9 +572,10 @@ public void onBodyDecoder(OnBodyData data) {
                 bodySpewer.spew();
                 return;
             }
-            
+
             // did not validate, so fall through and cache the response
             data.state.remove("cache-data");
+            cacheData.snapshot.close();
         }
 
         if (!caching)
@@ -623,17 +629,24 @@ public void onBodyDecoder(OnBodyData data) {
 
     @Override
     public void onRequestComplete(OnRequestCompleteData data) {
-        BodyCacher cacher = data.state.getParcelable("body-cacher");
-        if (cacher == null)
-            return;
+        CacheData cacheData = data.state.getParcelable("cache-data");
+        if (cacheData != null && cacheData.snapshot != null)
+            cacheData.snapshot.close();
 
-        try {
-            if (data.exception != null)
-                cacher.abort();
-            else
-                cacher.commit();
-        }
-        catch (Exception e) {
+        CachedSocket cachedSocket = Util.getWrappedSocket(data.socket, CachedSocket.class);
+        if (cachedSocket != null)
+            ((SnapshotCacheResponse)cachedSocket.cacheResponse).getSnapshot().close();
+
+        BodyCacher cacher = data.state.getParcelable("body-cacher");
+        if (cacher != null) {
+            try {
+                if (data.exception != null)
+                    cacher.abort();
+                else
+                    cacher.commit();
+            }
+            catch (Exception e) {
+            }
         }
     }
 
@@ -901,11 +914,20 @@ private static InputStream newBodyInputStream(final DiskLruCache.Snapshot snapsh
         };
     }
 
-    static class EntryCacheResponse extends CacheResponse {
+    static interface SnapshotCacheResponse {
+        public DiskLruCache.Snapshot getSnapshot();
+    }
+
+    static class EntryCacheResponse extends CacheResponse implements SnapshotCacheResponse {
         private final Entry entry;
         private final DiskLruCache.Snapshot snapshot;
         private final InputStream in;
 
+        @Override
+        public DiskLruCache.Snapshot getSnapshot() {
+            return snapshot;
+        }
+
         public EntryCacheResponse(Entry entry, DiskLruCache.Snapshot snapshot) {
             this.entry = entry;
             this.snapshot = snapshot;
@@ -921,11 +943,17 @@ public EntryCacheResponse(Entry entry, DiskLruCache.Snapshot snapshot) {
         }
     }
 
-    static class EntrySecureCacheResponse extends SecureCacheResponse {
+    static class EntrySecureCacheResponse extends SecureCacheResponse implements SnapshotCacheResponse {
         private final Entry entry;
         private final DiskLruCache.Snapshot snapshot;
         private final InputStream in;
 
+        @Override
+        public DiskLruCache.Snapshot getSnapshot() {
+            return snapshot;
+        }
+
+
         public EntrySecureCacheResponse(Entry entry, DiskLruCache.Snapshot snapshot) {
             this.entry = entry;
             this.snapshot = snapshot;

AndroidAsyncTest/src/com/koushikdutta/async/test/CacheTests.java

@@ -5,6 +5,7 @@
 import com.koushikdutta.async.AsyncServer;
 import com.koushikdutta.async.http.AsyncHttpClient;
 import com.koushikdutta.async.http.ResponseCacheMiddleware;
+import com.koushikdutta.async.http.libcore.DiskLruCache;
 import com.koushikdutta.async.http.libcore.HttpDate;
 import com.koushikdutta.async.http.server.AsyncHttpServer;
 import com.koushikdutta.async.http.server.AsyncHttpServerRequest;
@@ -51,4 +52,30 @@ public void onRequest(AsyncHttpServerRequest request, AsyncHttpServerResponse re
             client.getMiddleware().remove(cache);
         }
     }
+
+//    static public boolean deleteDirectory(File path) {
+//        if (path.exists()) {
+//            File[] files = path.listFiles();
+//            if (files != null) {
+//                for (int i = 0; i < files.length; i++) {
+//                    if (files[i].isDirectory()) {
+//                        deleteDirectory(files[i]);
+//                    } else {
+//                        files[i].delete();
+//                    }
+//                }
+//            }
+//        }
+//        return (path.delete());
+//    }
+
+//    public void testDiskLruCache() throws Exception {
+//        File dir = new File(Environment.getExternalStorageDirectory(), "AndroidAsyncTest/cache-test");
+//        deleteDirectory(dir);
+//        DiskLruCache cache = DiskLruCache.open(dir, 0, 1000, 10000000);
+//        DiskLruCache.Editor editor = cache.edit("stuff");
+//
+//        DiskLruCache cache2 = DiskLruCache.open(dir, 0, 2, 10000000);
+//        DiskLruCache.Snapshot snapshot = cache2.get("stuff");
+//    }
 }