ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-06-18 15:18:16 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Andrzej Cichocki
2017-10-02 15:59:55 +01:00
committed by GitHub
parent 383eb2bef8
commit 12982b3034
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
View File

@ -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()
}