Improve ClassSet to avoid memory leaks

didi · Jun 3, 2022 · ad3699f · ad3699f
1 parent 322fe76
commit ad3699f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/booster-cha/src/main/kotlin/com/didiglobal/booster/cha/ArchivedClassSet.kt b/booster-cha/src/main/kotlin/com/didiglobal/booster/cha/ArchivedClassSet.kt
@@ -19,12 +19,12 @@ internal class ArchivedClassSet<ClassFile, ClassParser : ClassFileParser<ClassFi
         override val parser: ClassParser
 ) : AbstractClassSet<ClassFile, ClassParser>() {
 
-    private val zip = ZipFile(location)
-
     private val classes: Map<String, ClassFile> by lazy {
-        zip.entries().iterator().asIterable().parallelStream().filter(CLASS_ENTRY_FILTER).map { entry ->
-            parser.parse(zip.getInputStream(entry))
-        }.collect(toMap(parser::getClassName) { it })
+        ZipFile(location).use { zip ->
+            zip.entries().iterator().asIterable().parallelStream().filter(CLASS_ENTRY_FILTER).map { entry ->
+                parser.parse(zip.getInputStream(entry))
+            }.collect(toMap(parser::getClassName) { it })
+        }
     }
 
     constructor(location: String, parser: ClassParser) : this(File(location).takeIf {
@@ -47,7 +47,7 @@ internal class ArchivedClassSet<ClassFile, ClassParser : ClassFileParser<ClassFi
 
     override fun iterator(): Iterator<ClassFile> = this.classes.values.iterator()
 
-    override fun close() = zip.close()
+    override fun close() = Unit
 
     override fun toString(): String = this.location.canonicalPath
 

diff --git a/booster-cha/src/main/kotlin/com/didiglobal/booster/cha/DirectoryClassSet.kt b/booster-cha/src/main/kotlin/com/didiglobal/booster/cha/DirectoryClassSet.kt
@@ -44,7 +44,6 @@ internal class DirectoryClassSet<ClassFile, ClassParser : ClassFileParser<ClassF
 
     override fun toString(): String = this.location.canonicalPath
 
-    override fun close() {
-    }
+    override fun close() = Unit
 
 }