Skip to content
Snippets Groups Projects
Commit 18241878 authored by rodrigo's avatar rodrigo
Browse files

Fixes issue #241 and also the failing ServiceIntegrationTests

parent e3e65885
Branches master
No related tags found
No related merge requests found
...@@ -416,8 +416,6 @@ public class DefaultNode implements ConnectedNode { ...@@ -416,8 +416,6 @@ public class DefaultNode implements ConnectedNode {
// NOTE(damonkohler): We don't want to raise potentially spurious // NOTE(damonkohler): We don't want to raise potentially spurious
// exceptions during shutdown that would interrupt the process. This is // exceptions during shutdown that would interrupt the process. This is
// simply best effort cleanup. // simply best effort cleanup.
slaveServer.shutdown();
topicParticipantManager.shutdown();
for (ServiceServer<?, ?> serviceServer : serviceManager.getServers()) { for (ServiceServer<?, ?> serviceServer : serviceManager.getServers()) {
try { try {
Response<Integer> response = Response<Integer> response =
...@@ -436,8 +434,9 @@ public class DefaultNode implements ConnectedNode { ...@@ -436,8 +434,9 @@ public class DefaultNode implements ConnectedNode {
for (ServiceClient<?, ?> serviceClient : serviceManager.getClients()) { for (ServiceClient<?, ?> serviceClient : serviceManager.getClients()) {
serviceClient.shutdown(); serviceClient.shutdown();
} }
registrar.shutdown();
slaveServer.shutdown(); slaveServer.shutdown();
topicParticipantManager.shutdown();
registrar.shutdown();
signalOnShutdownComplete(); signalOnShutdownComplete();
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment