ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-04-13 06:03:13 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fixed noderunner issues on Windows by fixing a windows specific path

Browse Source 
quoting issue.
This commit is contained in:
Clinton Alexander 2017-06-01 13:31:35 +01:00
parent 81d32fd6a7
commit ecf85c7448
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gradle-plugins/cordformation/src/noderunner/kotlin/net/corda/plugins/NodeRunner.kt
View File

@ -3,6 +3,7 @@ package net.corda.plugins
import java.awt.GraphicsEnvironment
import java.io.File
import java.nio.file.Files
import java.nio.file.Path
import java.util.*
private val HEADLESS_FLAG = "--headless"
@ -64,16 +65,24 @@ private object WebJarType : JarType("corda-webserver.jar") {
private abstract class JavaCommand(jarName: String, internal val dir: File, debugPort: Int?, internal val nodeName: String, init: MutableList<String>.() -> Unit, args: List<String>) {
internal val command: List<String> = mutableListOf<String>().apply {
add(File(File(System.getProperty("java.home"), "bin"), "java").path)
add(javaPath)
add("-Dname=$nodeName")
null != debugPort && add("-Dcapsule.jvm.args=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=$debugPort")
add("-jar"); add(jarName)
add("-jar")
add(jarName)
init()
addAll(args)
}
internal abstract fun processBuilder(): ProcessBuilder
internal fun start() = processBuilder().directory(dir).start()
private val javaPath: String by lazy {
val path = File(File(System.getProperty("java.home"), "bin"), "java").path
// Replace below is to fix an issue with spaces in paths on Windows.
// Quoting the entire path does not work, only the space or directory within the path.
if(os == OS.WINDOWS) path.replace(" ", "\" \"") else path
}
}
private class HeadlessJavaCommand(jarName: String, dir: File, debugPort: Int?, args: List<String>) : JavaCommand(jarName, dir, debugPort, dir.name, { add("--no-local-shell") }, args) {