ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-28 16:58:55 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

More code review tweaks.

Browse Source
This commit is contained in:
Chris Rankin 2017-02-23 17:42:19 +00:00
parent 2664a2905c
commit 34797c2735
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tools/demobench/src/main/kotlin/net/corda/demobench/pty/R3Pty.kt
View File

@ -28,25 +28,19 @@ class R3Pty(val name: String, settings: SettingsProvider, dimension: Dimension,
} }
private fun createTtyConnector(command: Array<String>, environment: Map<String, String>, workingDir: String?): TtyConnector { private fun createTtyConnector(command: Array<String>, environment: Map<String, String>, workingDir: String?): TtyConnector {
try { val process = PtyProcess.exec(command, environment, workingDir)
val process = PtyProcess.exec(command, environment, workingDir)
try { try {
return PtyProcessTtyConnector(name, process, UTF_8) return PtyProcessTtyConnector(name, process, UTF_8)
} catch (e: Exception) {
process.destroyForcibly()
process.waitFor(30, TimeUnit.SECONDS)
throw e
}
} catch (e: Exception) { } catch (e: Exception) {
throw IllegalStateException(e.message, e) process.destroyForcibly()
process.waitFor(30, TimeUnit.SECONDS)
throw e
} }
} }
fun run(args: Array<String>, envs: Map<String, String>, workingDir: String?) { fun run(args: Array<String>, envs: Map<String, String>, workingDir: String?) {
if (terminal.isSessionRunning) { check(!terminal.isSessionRunning, { "${terminal.sessionName} is already running" })
throw IllegalStateException(terminal.sessionName + " is already running")
}
val environment = HashMap<String, String>(envs) val environment = HashMap<String, String>(envs)
if (!UIUtil.isWindows) { if (!UIUtil.isWindows) {