Fix broken DiskBasedCache

Change-Id: Ia5db47122af11223b55845ef8423424a9cddbb21
Signed-off-by: Ralph Bergmann <ralph@the4thfloor.eu>

1 files changed, 3 insertions, 8 deletions

diff --git a/src/main/java/com/android/volley/toolbox/DiskBasedCache.java b/src/main/java/com/android/volley/toolbox/DiskBasedCache.java
index 036b55a..ff687d6 100644
--- a/src/main/java/com/android/volley/toolbox/DiskBasedCache.java
+++ b/src/main/java/com/android/volley/toolbox/DiskBasedCache.java
@@ -62,7 +62,7 @@ public class DiskBasedCache implements Cache {
     private static final float HYSTERESIS_FACTOR = 0.9f;
 
     /** Magic number for current version of cache file format. */
-    private static final int CACHE_MAGIC = 0x20140623;
+    private static final int CACHE_MAGIC = 0x20150306;
 
     /**
      * Constructs an instance of the DiskBasedCache at the specified directory.
@@ -397,16 +397,11 @@ public class DiskBasedCache implements Cache {
                 entry.etag = null;
             }
             entry.serverDate = readLong(is);
+            entry.lastModified = readLong(is);
             entry.ttl = readLong(is);
             entry.softTtl = readLong(is);
             entry.responseHeaders = readStringStringMap(is);
 
-            try {
-                entry.lastModified = readLong(is);
-            } catch (EOFException e) {
-                // the old cache entry format doesn't know lastModified
-            }
-
             return entry;
         }
 
@@ -435,10 +430,10 @@ public class DiskBasedCache implements Cache {
                 writeString(os, key);
                 writeString(os, etag == null ? "" : etag);
                 writeLong(os, serverDate);
+                writeLong(os, lastModified);
                 writeLong(os, ttl);
                 writeLong(os, softTtl);
                 writeStringStringMap(responseHeaders, os);
-                writeLong(os, lastModified);
                 os.flush();
                 return true;
             } catch (IOException e) {