Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add a workaround for a race condition while closing the socket (#2212) #2233

Merged
merged 1 commit into from
May 31, 2022
Merged

Add a workaround for a race condition while closing the socket (#2212) #2233

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions clients/rospy/src/rospy/impl/tcpros_base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -856,6 +856,13 @@ def close(self):
pass
finally:
self.socket.close()
except AttributeError:
# this is a workaround to avoid a race condition: thread A
# checks the self.socket to be not None (above in
# this function), thread B sets it to None (below in this
# function) and then thread A executes self.socket.close()
# (above in this function)
pass
finally:
self.socket = self.read_buff = self.write_buff = self.protocol = None
super(TCPROSTransport, self).close()