Used lists instead of strings for appending to JavaArgs in driver.

This commit is contained in:
Clinton Alexander 2016-08-30 14:01:54 +01:00
parent 82b416cb88
commit 0c4a80453a

View File

@ -458,14 +458,14 @@ class DriverDSL(
val classpath = System.getProperty("java.class.path") val classpath = System.getProperty("java.class.path")
val path = System.getProperty("java.home") + separator + "bin" + separator + "java" val path = System.getProperty("java.home") + separator + "bin" + separator + "java"
val debugPortArg: String = if(debugPort != null) val debugPortArg = if(debugPort != null)
"-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=$debugPort" listOf("-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=$debugPort")
else else
"" emptyList()
val javaArgs = listOf(path) + val javaArgs = listOf(path) +
listOf("-Dname=$legalName", "-javaagent:$quasarJarPath", debugPortArg, listOf("-Dname=$legalName", "-javaagent:$quasarJarPath") + debugPortArg +
"-cp", classpath, className) + listOf("-cp", classpath, className) +
cliParams.toCliArguments() cliParams.toCliArguments()
val builder = ProcessBuilder(javaArgs) val builder = ProcessBuilder(javaArgs)
builder.redirectError(Paths.get("error.$className.log").toFile()) builder.redirectError(Paths.get("error.$className.log").toFile())