azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ignore non-jar files in ServiceLoaderLite (KT-29513)

Browse Source
This commit is contained in:
Yan Zhulanow
2019-01-31 15:43:51 +03:00
parent 15a316ff90
commit 0444203b9b
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/plugins/ServiceLoaderLite.kt
+1 -1
View File
@@ -71,7 +71,7 @@ object ServiceLoaderLite {
return when { return when {
file.isDirectory -> findImplementationsInDirectory(classIdentifier, file) file.isDirectory -> findImplementationsInDirectory(classIdentifier, file)
file.isFile -> findImplementationsInJar(classIdentifier, file) file.isFile && file.extension.toLowerCase() == "jar" -> findImplementationsInJar(classIdentifier, file)
else -> emptySet() else -> emptySet()
} }
} }
compiler/tests/org/jetbrains/kotlin/cli/serviceLoaderLite/AbstractServiceLoaderLiteTest.kt
+1 -1
View File
@@ -37,7 +37,7 @@ abstract class AbstractServiceLoaderLiteTest : TestCaseWithTmpdir() {
} }
protected fun writeJar(fileName: String, vararg entries: Entry): File { protected fun writeJar(fileName: String, vararg entries: Entry): File {
val file = File(tmpdir, fileName) val file = File(tmpdir, "$fileName.jar")
if (file.exists()) { if (file.exists()) {
throw IllegalStateException("File $fileName already exists") throw IllegalStateException("File $fileName already exists")
} }
compiler/tests/org/jetbrains/kotlin/cli/serviceLoaderLite/ServiceLoaderLiteTest.kt
+7
View File
@@ -7,6 +7,7 @@ package org.jetbrains.kotlin.cli.serviceLoaderLite
import org.jetbrains.kotlin.cli.jvm.plugins.ServiceLoaderLite import org.jetbrains.kotlin.cli.jvm.plugins.ServiceLoaderLite
import org.jetbrains.kotlin.cli.jvm.plugins.ServiceLoaderLite.ServiceLoadingException import org.jetbrains.kotlin.cli.jvm.plugins.ServiceLoaderLite.ServiceLoadingException
import java.io.File
import javax.annotation.processing.Processor import javax.annotation.processing.Processor
class ServiceLoaderLiteTest : AbstractServiceLoaderLiteTest() { class ServiceLoaderLiteTest : AbstractServiceLoaderLiteTest() {
@@ -112,5 +113,11 @@ class ServiceLoaderLiteTest : AbstractServiceLoaderLiteTest() {
assertTrue("test.Zoo" in impls) assertTrue("test.Zoo" in impls)
} }
} }
fun testWrongJarName() {
val file = File(tmpdir, "foo.tar.gz")
file.writeText("foobar")
ServiceLoaderLite.findImplementations(Processor::class.java, listOf(file))
}
} }