From 788d8ef65f2fa169fa04de2ff0ab19f8182c7b14 Mon Sep 17 00:00:00 2001
From: Mat Rizzo <mat.rizzo@r3.com>
Date: Thu, 26 Oct 2017 11:48:15 +0100
Subject: [PATCH] CORDA-742 Minor refactor

---
 .../src/main/kotlin/net/corda/plugins/Cordform.kt    | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/gradle-plugins/cordformation/src/main/kotlin/net/corda/plugins/Cordform.kt b/gradle-plugins/cordformation/src/main/kotlin/net/corda/plugins/Cordform.kt
index ec9e07f22b..cb358043d8 100644
--- a/gradle-plugins/cordformation/src/main/kotlin/net/corda/plugins/Cordform.kt
+++ b/gradle-plugins/cordformation/src/main/kotlin/net/corda/plugins/Cordform.kt
@@ -152,10 +152,10 @@ open class Cordform : DefaultTask() {
         project.logger.info("Generating node infos")
         var nodeProcesses = buildNodeProcesses()
         try {
-            nodeProcesses.forEach { (node, process) -> validateNodeProcess(node, process) }
+            validateNodeProcessess(nodeProcesses)
         }
         finally {
-            nodeProcesses.forEach { it.second.destroyForcibly() }
+            destroyNodeProcesses(nodeProcesses)
         }
     }
 
@@ -163,6 +163,14 @@ open class Cordform : DefaultTask() {
         return nodes.map { buildNodeProcess(it, makeLogDirectory(it)) }
     }
 
+    private fun validateNodeProcessess(processes: List<Pair<Node, Process>>) {
+        nodeProcesses.forEach { (node, process) -> validateNodeProcess(node, process) }
+    }
+
+    private fun destroyNodeProcesses(processes: List<Pair<Node, Process>>) {
+        nodeProcesses.forEach { it.second.destroyForcibly() }
+    }
+
     private fun makeLogDirectory(node: Node): File {
         var logDir = File(fullNodePath(node).toFile(), "logs")
         logDir.mkdirs()