Add protection for 0 byte cache entries

androidx · Feb 8, 2024 · 163724a · 163724a
1 parent 30c60aa
commit 163724a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/s3buildcache/src/main/kotlin/androidx/build/gradle/s3buildcache/S3BuildCacheService.kt b/s3buildcache/src/main/kotlin/androidx/build/gradle/s3buildcache/S3BuildCacheService.kt
@@ -69,6 +69,7 @@ class S3BuildCacheService(
     }
 
     override fun store(key: BuildCacheKey, writer: BuildCacheEntryWriter) {
+        if (writer.size == 0L) return // do not store empty entries into the cache
         logger.info("Storing ${key.blobKey()}")
         val cacheKey = key.blobKey()
         val output = ByteArrayOutputStream()

diff --git a/s3buildcache/src/main/kotlin/androidx/build/gradle/s3buildcache/S3StorageService.kt b/s3buildcache/src/main/kotlin/androidx/build/gradle/s3buildcache/S3StorageService.kt
@@ -131,6 +131,7 @@ class S3StorageService(
             return try {
                 val inputStream = client.getObject(request)
                 val blob = inputStream.response() ?: return null
+                if (blob.contentLength() == 0L) return null // return empty entries as a cache miss
                 if (blob.contentLength() > sizeThreshold) {
                     val path = FileHandleInputStream.create()
                     val outputStream = path.outputStream()