增加非空判断

Author: alafighting

library/src/main/java/com/im4j/kakacache/rxjava/core/disk/storage/FileDiskStorage.java

@@ -88,6 +88,9 @@ public boolean isClosed() {
 
     @Override
     public void remove(String key) throws CacheException {
+        if (Utils.isEmpty(key)) {
+            return;
+        }
         try {
             delete(new File(mStorageDir, key));
         } catch (IOException e) {
@@ -125,6 +128,9 @@ private long countSize(File file) {
     }
 
     public void delete(File file) throws IOException {
+        if (file == null) {
+            return;
+        }
         // If delete() fails, make sure it's because the file didn't exist!
         if (!file.delete() && file.exists()) {
             throw new IOException("failed to delete " + file);

library/src/main/java/com/im4j/kakacache/rxjava/core/memory/journal/LRUMemoryJournal.java

@@ -39,7 +39,7 @@ public void put(String key, CacheEntry entry) {
     @Override
     public boolean containsKey(String key) {
         CacheEntry entry = mKeyValue.get(key);
-        return entry != null && !entry.isExpiry();
+        return entry != null;
     }
 
     @Override

library/src/main/java/com/im4j/kakacache/rxjava/core/memory/storage/SimpleMemoryStorage.java

@@ -59,6 +59,9 @@ public boolean isClosed() {
 
     @Override
     public void remove(String key) throws CacheException {
+        if (Utils.isEmpty(key)) {
+            return;
+        }
         mStorageMap.remove(key);
     }
 
@@ -78,6 +81,10 @@ public long getTotalSize() {
     }
 
     private static long countSize(Object value) {
+        if (value == null) {
+            return 0;
+        }
+
         // FIXME 更优良的内存大小算法
         long size = 1;
         if (value instanceof MemorySizeOf.SizeOf) {