Mark FileCache initialized after init really goes through.

Bug: 5988196
Change-Id: Ia826ce6a33c200a2cd09c21d7ef22f4dd161caa9

diff --git a/gallerycommon/src/com/android/gallery3d/common/FileCache.java b/gallerycommon/src/com/android/gallery3d/common/FileCache.java
index 938ef8c..a69487f 100644 (file)
--- a/gallerycommon/src/com/android/gallery3d/common/FileCache.java
+++ b/gallerycommon/src/com/android/gallery3d/common/FileCache.java
@@ -191,7 +191,6 @@ public class FileCache implements Closeable {
 
     private synchronized void initialize() {
         if (mInitialized) return;
-        mInitialized = true;
 
         if (!mRootDir.isDirectory()) {
             mRootDir.mkdirs();
@@ -209,6 +208,10 @@ public class FileCache implements Closeable {
             cursor.close();
         }
         if (mTotalBytes > mCapacity) freeSomeSpaceIfNeed(MAX_DELETE_COUNT);
+
+        // Mark initialized when everything above went through. If an exception was thrown,
+        // initialize() will be retried later.
+        mInitialized = true;
     }
 
     private void freeSomeSpaceIfNeed(int maxDeleteFileCount) {