From: Vratko Polak <vrpolak@cisco.com>
Date: Wed, 12 Jun 2019 14:43:06 +0000 (+0200)
Subject: papi: make socket disconnect more robust
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F91%2F20091%2F2;p=vpp.git

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 <vrpolak@cisco.com>
---

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.