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

node, integtest: Code style

Browse Source
This commit is contained in:
Andras Slemmer 2016-06-27 10:23:48 +01:00
parent ffa9ad1bc9
commit 429d8aab74
6 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
node/src/main/kotlin/com/r3corda/node/internal/Node.kt
View File

@ -71,7 +71,7 @@ class Node(dir: Path, val p2pAddr: HostAndPort, configuration: NodeConfiguration
// when our process shuts down, but we try in stop() anyway just to be nice. // when our process shuts down, but we try in stop() anyway just to be nice.
private var nodeFileLock: FileLock? = null private var nodeFileLock: FileLock? = null
// Todo: Move to node config file // TODO: Move to node config file
private var webServerPort: Int = p2pAddr.port + 1 private var webServerPort: Int = p2pAddr.port + 1
override fun makeMessagingService(): MessagingService = ArtemisMessagingService(dir, p2pAddr, serverThread) override fun makeMessagingService(): MessagingService = ArtemisMessagingService(dir, p2pAddr, serverThread)

3
node/src/main/kotlin/com/r3corda/node/servlets/DataUploadServlet.kt
View File

@ -36,8 +36,7 @@ class DataUploadServlet : HttpServlet() {
val iterator = upload.getItemIterator(req) val iterator = upload.getItemIterator(req)
val messages = ArrayList<String>() val messages = ArrayList<String>()
if(!iterator.hasNext()) if (!iterator.hasNext()) {
{
resp.sendError(HttpServletResponse.SC_BAD_REQUEST, "Got an upload request with no files") resp.sendError(HttpServletResponse.SC_BAD_REQUEST, "Got an upload request with no files")
return return
} }

1
src/integration-test/kotlin/com/r3corda/core/testing/IRSDemoTest.kt
View File

@ -31,6 +31,7 @@ class IRSDemoTest {
} }
} }
} }
private fun setupNode(dir: Path, nodeType: String) { private fun setupNode(dir: Path, nodeType: String) {
println("Running setup for $nodeType") println("Running setup for $nodeType")
val args = listOf("--role", "Setup" + nodeType, "--dir", dir.toString()) val args = listOf("--role", "Setup" + nodeType, "--dir", dir.toString())