ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-31 00:24:59 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

ISSUE-246 deployNodes doesn't use right version of Java (#5571)

Browse Source 
* ISSUE-246 deployNodes doesn't use right version of Java
Ensure the network bootstrapper process is executed using the same version of JAVA as the calling process.

* Apply same fix to NotaryCopier (used in network builder tool).
This commit is contained in:
josecoll 2019-10-09 19:32:17 +01:00 committed by GitHub
parent 515d1088d5
commit 22a8108099
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
node-api/src/main/kotlin/net/corda/nodeapi/internal/network/NetworkBootstrapper.kt
View File

@ -33,6 +33,7 @@ import java.io.File
import java.net.URL import java.net.URL
import java.nio.file.FileAlreadyExistsException import java.nio.file.FileAlreadyExistsException
import java.nio.file.Path import java.nio.file.Path
import java.nio.file.Paths
import java.nio.file.StandardCopyOption.REPLACE_EXISTING import java.nio.file.StandardCopyOption.REPLACE_EXISTING
import java.security.PublicKey import java.security.PublicKey
import java.time.Duration import java.time.Duration
@ -68,7 +69,7 @@ internal constructor(private val initSerEnv: Boolean,
companion object { companion object {
// TODO This will probably need to change once we start using a bundled JVM // TODO This will probably need to change once we start using a bundled JVM
private val nodeInfoGenCmd = listOf( private val nodeInfoGenCmd = listOf(
"java", Paths.get(System.getProperty("java.home"), "bin", "java").toString(),
"-jar", "-jar",
"corda.jar", "corda.jar",
"generate-node-info" "generate-node-info"

5
tools/network-builder/src/main/kotlin/net/corda/networkbuilder/notaries/NotaryCopier.kt
View File

@ -6,6 +6,7 @@ import net.corda.networkbuilder.nodes.FoundNode
import net.corda.networkbuilder.nodes.NodeCopier import net.corda.networkbuilder.nodes.NodeCopier
import org.slf4j.LoggerFactory import org.slf4j.LoggerFactory
import java.io.File import java.io.File
import java.nio.file.Paths
class NotaryCopier(private val cacheDir: File) : NodeCopier(cacheDir) { class NotaryCopier(private val cacheDir: File) : NodeCopier(cacheDir) {
@ -28,7 +29,9 @@ class NotaryCopier(private val cacheDir: File) : NodeCopier(cacheDir) {
fun generateNodeInfo(dirToGenerateFrom: File): File { fun generateNodeInfo(dirToGenerateFrom: File): File {
val nodeInfoGeneratorProcess = ProcessBuilder() val nodeInfoGeneratorProcess = ProcessBuilder()
.command(listOf("java", "-jar", "corda.jar", "generate-node-info")) .command(listOf(
Paths.get(System.getProperty("java.home"), "bin", "java").toString(),
"-jar", "corda.jar", "generate-node-info"))
.directory(dirToGenerateFrom) .directory(dirToGenerateFrom)
.inheritIO() .inheritIO()
.start() .start()