Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

support for setting the correct classloader on threadlocal when compi… #42

Merged
merged 1 commit into from
Jan 13, 2020
Merged

support for setting the correct classloader on threadlocal when compi… #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion plugin/src/main/scala/eisner/EisnerPlugin.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@ object EisnerPlugin extends AutoPlugin with ReflectionSupport with SnippetSuppor
val dcp = (Compile / dependencyClasspath).value.map(_.data)
val scp = (Compile / scalaInstance).value.allJars

// Let's capture the original classloader associated to the current thread
val originalClassloader = Thread.currentThread.getContextClassLoader

val topologyDescriptions = eisnerTopologiesSnippet.value match {
case None =>
val cp = dcp.filter(f => f.getName.contains("kafka") || f.getName.contains("slf4j")) :+ cd
Expand All @@ -68,7 +71,7 @@ object EisnerPlugin extends AutoPlugin with ReflectionSupport with SnippetSuppor
// see https://stackoverflow.com/a/30251930
Thread.currentThread.setContextClassLoader(classOf[PromiseException].getClassLoader)

if (topologyDescriptions.nonEmpty) {
val result: Set[File] = if (topologyDescriptions.nonEmpty) {
val config = Config(eisnerColorSubtopology.value, eisnerColorTopic.value, eisnerColorSink.value)
val topologiesWithDots = topologyDescriptions
.map {
Expand Down Expand Up @@ -102,6 +105,11 @@ object EisnerPlugin extends AutoPlugin with ReflectionSupport with SnippetSuppor
log.warn("Eisner - No topology found!")
Set.empty
}

// re-set the current thread's classloader to what we captured at the start
Thread.currentThread.setContextClassLoader(originalClassloader)

result
}
}
}
5 changes: 5 additions & 0 deletions plugin/src/main/scala/eisner/SnippetSupport.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,11 @@ private[eisner] final class Compiler(bootClasspath: Seq[File], classpath: Seq[Fi

private[this] final def compile(code: String): Class[_] = {
val name = className(code)

// external code we're compiling in the snippet may be relying on current thread's classloader
// e.g. https://github.com/sksamuel/avro4s/blob/v3.0.5/avro4s-core/src/main/scala/com/sksamuel/avro4s/SchemaFor.scala#L323
Thread.currentThread.setContextClassLoader(cl)

run.compileSources(new BatchSourceFile("(inline)", mkClass(name, code)) :: Nil)
cl.loadClass(name)
}
Expand Down