From 5769f80cbe3e03480990b6d18f161987a39f7cf8 Mon Sep 17 00:00:00 2001 From: Ethan Atkins Date: Tue, 24 Nov 2020 12:32:15 -0800 Subject: [PATCH] Use jni if required when running client from xMain See https://github.com/sbt/sbt/issues/6162#issuecomment-733207878. --- .../src/main/scala/sbt/internal/client/NetworkClient.scala | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/main-command/src/main/scala/sbt/internal/client/NetworkClient.scala b/main-command/src/main/scala/sbt/internal/client/NetworkClient.scala index ccf33bbe4..9e47c279e 100644 --- a/main-command/src/main/scala/sbt/internal/client/NetworkClient.scala +++ b/main-command/src/main/scala/sbt/internal/client/NetworkClient.scala @@ -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