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

Merge remote-tracking branch 'open/master' into tudor-os-merge-7-jun

Browse Source 
# Conflicts:
#	node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
#	node/src/main/kotlin/net/corda/node/internal/NodeStartup.kt
This commit is contained in:
tudor.malene@gmail.com
2018-06-07 16:05:11 +01:00
parent e7d98f52aa c474c04503
commit 5140d46aa2
5 changed files with 37 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
node-api/src/main/kotlin/net/corda/nodeapi/internal/persistence/CordaPersistence.kt
View File

@ -296,4 +296,6 @@ private fun Throwable.hasSQLExceptionCause(): Boolean =
null -> false
is SQLException -> true
else -> cause?.hasSQLExceptionCause() ?: false
}
}
class CouldNotCreateDataSourceException(override val message: String?, override val cause: Throwable? = null) : Exception()