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

Create an emptyMap when MDC.getCopyOfContextMap() is null (#5545)

Browse Source
This commit is contained in:
opticyclic 2019-10-03 06:48:47 -04:00 committed by Matthew Nesbit
parent 2965a21d2f
commit e0eb358d59
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
node-api/src/main/kotlin/net/corda/nodeapi/internal/bridging/AMQPBridgeManager.kt
View File

@ -83,7 +83,7 @@ class AMQPBridgeManager(config: MutualSslConfiguration,
} }
private fun withMDC(block: () -> Unit) { private fun withMDC(block: () -> Unit) {
val oldMDC = MDC.getCopyOfContextMap() val oldMDC = MDC.getCopyOfContextMap() ?: emptyMap<String, String>()
try { try {
MDC.put("queueName", queueName) MDC.put("queueName", queueName)
MDC.put("targets", targets.joinToString(separator = ";") { it.toString() }) MDC.put("targets", targets.joinToString(separator = ";") { it.toString() })

2
node-api/src/main/kotlin/net/corda/nodeapi/internal/protonwrapper/engine/ConnectionStateMachine.kt
View File

@ -46,7 +46,7 @@ internal class ConnectionStateMachine(private val serverMode: Boolean,
} }
private fun withMDC(block: () -> Unit) { private fun withMDC(block: () -> Unit) {
val oldMDC = MDC.getCopyOfContextMap() val oldMDC = MDC.getCopyOfContextMap() ?: emptyMap<String, String>()
try { try {
MDC.put("serverMode", serverMode.toString()) MDC.put("serverMode", serverMode.toString())
MDC.put("localLegalName", localLegalName) MDC.put("localLegalName", localLegalName)

2
node-api/src/main/kotlin/net/corda/nodeapi/internal/protonwrapper/engine/EventProcessor.kt
View File

@ -41,7 +41,7 @@ internal class EventProcessor(channel: Channel,
} }
private fun withMDC(block: () -> Unit) { private fun withMDC(block: () -> Unit) {
val oldMDC = MDC.getCopyOfContextMap() val oldMDC = MDC.getCopyOfContextMap() ?: emptyMap<String, String>()
try { try {
MDC.put("serverMode", serverMode.toString()) MDC.put("serverMode", serverMode.toString())
MDC.put("localLegalName", localLegalName) MDC.put("localLegalName", localLegalName)

2
node-api/src/main/kotlin/net/corda/nodeapi/internal/protonwrapper/netty/AMQPChannelHandler.kt
View File

@ -49,7 +49,7 @@ internal class AMQPChannelHandler(private val serverMode: Boolean,
private var badCert: Boolean = false private var badCert: Boolean = false
private fun withMDC(block: () -> Unit) { private fun withMDC(block: () -> Unit) {
val oldMDC = MDC.getCopyOfContextMap() val oldMDC = MDC.getCopyOfContextMap() ?: emptyMap<String, String>()
try { try {
MDC.put("serverMode", serverMode.toString()) MDC.put("serverMode", serverMode.toString())
MDC.put("remoteAddress", remoteAddress.toString()) MDC.put("remoteAddress", remoteAddress.toString())