luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6167 from eatkins/client-jni 

Use jni if required when running client from xMain
This commit is contained in:
eugene yokota 2020-11-24 16:54:18 -05:00 committed by GitHub
parent 13b09bcd8f 5769f80cbe
commit 2e248ca7c2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
main-command/src/main/scala/sbt/internal/client/NetworkClient.scala
View File

@ -1228,7 +1228,8 @@ object NetworkClient {
val err = new PrintStream(term.errorStream)
val out = if (redirectOutput) err else new PrintStream(term.outputStream)
val args = parseArgs(arguments.toArray).withBaseDirectory(configuration.baseDirectory)
val client = simpleClient(args, term.inputStream, out, err, useJNI = false)
val useJNI = BootServerSocket.requiresJNI || System.getProperty("sbt.ipcsocket.jni", "false") == "true"
val client = simpleClient(args, term.inputStream, out, err, useJNI = useJNI)
clientImpl(client, args.bsp)
}
private class AccessDeniedException extends Throwable