From 18241878aa4eb763e648e6afdbf07531ba6059c0 Mon Sep 17 00:00:00 2001
From: rodrigo <rjcausarano@gmail.com>
Date: Thu, 4 Apr 2019 11:34:47 -0400
Subject: [PATCH] Fixes issue #241 and also the failing ServiceIntegrationTests
---
rosjava/src/main/java/org/ros/internal/node/DefaultNode.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/rosjava/src/main/java/org/ros/internal/node/DefaultNode.java b/rosjava/src/main/java/org/ros/internal/node/DefaultNode.java
index 9f1a1bdc..28e7e2d5 100644
--- a/rosjava/src/main/java/org/ros/internal/node/DefaultNode.java
+++ b/rosjava/src/main/java/org/ros/internal/node/DefaultNode.java
@@ -416,8 +416,6 @@ public class DefaultNode implements ConnectedNode {
// NOTE(damonkohler): We don't want to raise potentially spurious
// exceptions during shutdown that would interrupt the process. This is
// simply best effort cleanup.
- slaveServer.shutdown();
- topicParticipantManager.shutdown();
for (ServiceServer<?, ?> serviceServer : serviceManager.getServers()) {
try {
Response<Integer> response =
@@ -436,8 +434,9 @@ public class DefaultNode implements ConnectedNode {
for (ServiceClient<?, ?> serviceClient : serviceManager.getClients()) {
serviceClient.shutdown();
}
- registrar.shutdown();
slaveServer.shutdown();
+ topicParticipantManager.shutdown();
+ registrar.shutdown();
signalOnShutdownComplete();
}
--
GitLab