Skip to content

Commit c9cba6a

Browse files
committed
Possible deadlock
Signed-off-by: Ivan Santiago Paunovic <ivanpauno@ekumenlabs.com>
1 parent d85caa6 commit c9cba6a

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

rclpy/rclpy/context.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,10 +120,10 @@ def on_shutdown(self, callback: Callable[[], None]):
120120
"""Add a callback to be called on shutdown."""
121121
if not callable(callback):
122122
raise TypeError('callback should be a callable, got {}', type(callback))
123-
with self._callbacks_lock:
124-
if not self.ok():
125-
callback()
126-
else:
123+
if not self.ok():
124+
callback()
125+
else:
126+
with self._callbacks_lock:
127127
self._callbacks.append(weakref.WeakMethod(callback, self._remove_callback))
128128

129129
def _logging_fini(self):

0 commit comments

Comments
 (0)