ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-31 08:25:50 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merged in mnesbit-cleanup-correct-shutdown-exceptions (pull request #333)

Browse Source 
Fix noisy exceptions in some tests during node stop.
This commit is contained in:
Matthew Nesbit 2016-09-06 17:02:13 +01:00
commit 7503ffc10a
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
node/src/main/kotlin/com/r3corda/node/internal/AbstractNode.kt
View File

@ -168,7 +168,6 @@ abstract class AbstractNode(val dir: Path, val configuration: NodeConfiguration,
checkpointStorage = storageServices.second checkpointStorage = storageServices.second
netMapCache = InMemoryNetworkMapCache() netMapCache = InMemoryNetworkMapCache()
net = makeMessagingService() net = makeMessagingService()
runOnStop += Runnable { net.stop() }
wallet = makeWalletService() wallet = makeWalletService()
identity = makeIdentityService() identity = makeIdentityService()
@ -211,6 +210,7 @@ abstract class AbstractNode(val dir: Path, val configuration: NodeConfiguration,
ScheduledActivityObserver(services) ScheduledActivityObserver(services)
startMessagingService() startMessagingService()
runOnStop += Runnable { net.stop() }
_networkMapRegistrationFuture.setFuture(registerWithNetworkMap()) _networkMapRegistrationFuture.setFuture(registerWithNetworkMap())
isPreviousCheckpointsPresent = checkpointStorage.checkpoints.any() isPreviousCheckpointsPresent = checkpointStorage.checkpoints.any()
smm.start() smm.start()

2
node/src/main/kotlin/com/r3corda/node/internal/Node.kt
View File

@ -281,7 +281,7 @@ class Node(dir: Path, val p2pAddr: HostAndPort, val webServerAddr: HostAndPort,
shutdown = true shutdown = true
// Unregister shutdown hook to prevent any unnecessary second calls to stop // Unregister shutdown hook to prevent any unnecessary second calls to stop
if(shutdownThread != null) { if((shutdownThread != null) && (Thread.currentThread() != shutdownThread)){
Runtime.getRuntime().removeShutdownHook(shutdownThread) Runtime.getRuntime().removeShutdownHook(shutdownThread)
shutdownThread = null shutdownThread = null
} }