Make removal of non-existent cache span a no-op

------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=155413733
zzc0611 · May 11, 2017 · 51132f5 · 51132f5
1 parent 1d6816d
commit 51132f5
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
@@ -286,7 +286,9 @@ private void addSpan(SimpleCacheSpan span) {
 
   private void removeSpan(CacheSpan span, boolean removeEmptyCachedContent) throws CacheException {
     CachedContent cachedContent = index.get(span.key);
-    Assertions.checkState(cachedContent.removeSpan(span));
+    if (cachedContent == null || !cachedContent.removeSpan(span)) {
+      return;
+    }
     totalSpace -= span.length;
     if (removeEmptyCachedContent && cachedContent.isEmpty()) {
       index.removeEmpty(cachedContent.key);