Move dbCloser to MockNode, the only thing that uses it. (corda#1512)

sreerajs · Oct 2, 2017 · 12982b3 · 12982b3
1 parent 383eb2b
commit 12982b3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt b/node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
@@ -146,7 +146,6 @@ abstract class AbstractNode(open val configuration: NodeConfiguration,
     protected lateinit var network: MessagingService
     protected val runOnStop = ArrayList<() -> Any?>()
     protected lateinit var database: CordaPersistence
-    protected var dbCloser: (() -> Any?)? = null
     lateinit var cordappProvider: CordappProviderImpl
     protected val cordappLoader by lazy { makeCordappLoader() }
 
@@ -476,10 +475,7 @@ abstract class AbstractNode(open val configuration: NodeConfiguration,
             database.transaction {
                 log.info("Connected to ${database.dataSource.connection.metaData.databaseProductName} database.")
             }
-            this.database::close.let {
-                dbCloser = it
-                runOnStop += it
-            }
+            runOnStop += database::close
             return database.transaction {
                 insideTransaction()
             }

diff --git a/testing/node-driver/src/main/kotlin/net/corda/testing/node/MockNode.kt b/testing/node-driver/src/main/kotlin/net/corda/testing/node/MockNode.kt
@@ -241,6 +241,12 @@ class MockNetwork(private val networkSendManuallyPumped: Boolean = false,
         // It is used from the network visualiser tool.
         @Suppress("unused") val place: WorldMapLocation get() = findMyLocation()!!
 
+        private var dbCloser: (() -> Any?)? = null
+        override fun <T> initialiseDatabasePersistence(insideTransaction: () -> T) = super.initialiseDatabasePersistence {
+            dbCloser = database::close
+            insideTransaction()
+        }
+
         fun disableDBCloseOnStop() {
             runOnStop.remove(dbCloser)
         }