From 5153a754dd0fbb15e8581ced929a397af870ad07 Mon Sep 17 00:00:00 2001
From: Yong Li <30503431+yli-cpr@users.noreply.github.com>
Date: Mon, 12 Aug 2019 17:16:01 -0400
Subject: [PATCH] Do not raise socket exception during shutdown (#1720)

---
 clients/rospy/src/rospy/impl/tcpros_base.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/clients/rospy/src/rospy/impl/tcpros_base.py b/clients/rospy/src/rospy/impl/tcpros_base.py
index 7cb08686f1..34c4f8992a 100644
--- a/clients/rospy/src/rospy/impl/tcpros_base.py
+++ b/clients/rospy/src/rospy/impl/tcpros_base.py
@@ -157,7 +157,8 @@ def run(self):
                 (errno, msg) = e.args
                 if errno == 4: #interrupted system call
                     continue
-                raise
+                if not self.is_shutdown:
+                    raise
             if self.is_shutdown:
                 break
             try: