Merge pull request #296 from rjcausarano/test-fix-proposal

Fix problems shutting down nodes

.gitignore

@@ -9,3 +9,4 @@ bin
 *.iml
 .idea
 bazel-*
+local.properties

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();
   }