Finish protocol in IncomingQueue thread (#502)

RobotWebTools · May 22, 2020 · 0d8de7c · 0d8de7c
1 parent 9e46e03
commit 0d8de7c
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/rosbridge_server/src/rosbridge_server/autobahn_websocket.py b/rosbridge_server/src/rosbridge_server/autobahn_websocket.py
@@ -108,6 +108,8 @@ def run(self):
 
             self.protocol.incoming(msg)
 
+        self.protocol.finish()
+
 
 @implementer(interfaces.IPushProducer)
 class OutgoingValve:
@@ -245,8 +247,9 @@ def onClose(self, was_clean, code, reason):
             return  # Closed before connection was opened.
         cls = self.__class__
         cls.clients_connected -= 1
-        self.protocol.finish()
-        self.incoming_queue.finish()
+
         if cls.client_manager:
             cls.client_manager.remove_client(self.client_id, self.peer)
         rospy.loginfo("Client disconnected. %d clients total.", cls.clients_connected)
+
+        self.incoming_queue.finish()