From c83311ddff9bce2a0e00cd6547c9680192cc3d8c Mon Sep 17 00:00:00 2001 From: Vratko Polak Date: Wed, 12 Jun 2019 16:43:06 +0200 Subject: papi: make socket disconnect more robust Previusly, read error could happen before message_thread starts, so do not attempt to join in that case. Change-Id: Ie119916831e320e38eb02e48515b4c6a9cb937e5 Signed-off-by: Vratko Polak --- src/vpp-api/python/vpp_papi/vpp_transport_socket.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vpp-api/python/vpp_papi/vpp_transport_socket.py b/src/vpp-api/python/vpp_papi/vpp_transport_socket.py index 6e228e46e11..d26a3d47bf3 100644 --- a/src/vpp-api/python/vpp_papi/vpp_transport_socket.py +++ b/src/vpp-api/python/vpp_papi/vpp_transport_socket.py @@ -149,7 +149,7 @@ class VppTransport(object): self.socket.close() if self.sque is not None: self.sque.put(True) # Terminate listening thread - if self.message_thread is not None: + if self.message_thread is not None and self.message_thread.is_alive(): # Allow additional connect() calls. self.message_thread.join() # Collect garbage. -- cgit 1.2.3-korg