Ignore IOException when calling ApolloHttpCache.remove (#5730)

apollographql · Mar 14, 2024 · 17dc887 · 17dc887
1 parent f9e439f
commit 17dc887
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/...http-cache/src/main/kotlin/com/apollographql/apollo3/cache/http/CachingHttpInterceptor.kt b/...http-cache/src/main/kotlin/com/apollographql/apollo3/cache/http/CachingHttpInterceptor.kt
@@ -17,6 +17,7 @@ import okio.Buffer
 import okio.ByteString.Companion.toByteString
 import okio.FileSystem
 import java.io.File
+import java.io.IOException
 import java.time.Instant
 import java.time.format.DateTimeParseException
 
@@ -144,7 +145,10 @@ class CachingHttpInterceptor internal constructor(
 
     val expireAfterRead = request.headers.valueOf(CACHE_EXPIRE_AFTER_READ_HEADER)?.lowercase() == "true"
     if (expireAfterRead) {
-      lruHttpCache.remove(cacheKey)
+      try {
+        lruHttpCache.remove(cacheKey)
+      } catch (_: IOException) {
+      }
     }
 
     val timeoutMillis = request.headers.valueOf(CACHE_EXPIRE_TIMEOUT_HEADER)?.toLongOrNull() ?: 0

diff --git a/...lo-http-cache/src/main/kotlin/com/apollographql/apollo3/cache/http/HttpCacheExtensions.kt b/...lo-http-cache/src/main/kotlin/com/apollographql/apollo3/cache/http/HttpCacheExtensions.kt
@@ -28,6 +28,7 @@ import kotlinx.coroutines.flow.onCompletion
 import kotlinx.coroutines.flow.onEach
 import okio.FileSystem
 import java.io.File
+import java.io.IOException
 
 enum class HttpFetchPolicy {
   /**
@@ -129,13 +130,19 @@ fun ApolloClient.Builder.httpCache(
               catch { throwable ->
                 // Revert caching of responses with errors
                 val cacheKey = synchronized(apolloRequestToCacheKey) { apolloRequestToCacheKey[request.requestUuid.toString()] }
-                cacheKey?.let { cachingHttpInterceptor.cache.remove(it) }
+                try {
+                  cacheKey?.let { cachingHttpInterceptor.cache.remove(it) }
+                } catch (_: IOException) {
+                }
                 throw throwable
               }.onEach { response ->
                 // Revert caching of responses with errors
                 val cacheKey = synchronized(apolloRequestToCacheKey) { apolloRequestToCacheKey[request.requestUuid.toString()] }
                 if (response.hasErrors()) {
-                  cacheKey?.let { cachingHttpInterceptor.cache.remove(it) }
+                  try {
+                    cacheKey?.let { cachingHttpInterceptor.cache.remove(it) }
+                  } catch (_: IOException) {
+                  }
                 }
               }.onCompletion {
                 synchronized(apolloRequestToCacheKey) { apolloRequestToCacheKey.remove(request.requestUuid.toString()) }