Merge branch 'master' into patch-1

This commit is contained in:
Josh Bailey 2021-09-09 18:25:59 +12:00 committed by GitHub
commit eead1ac358
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -285,7 +285,7 @@ class Activity(object):
"""Stops all threads spawn by this activity.
"""
for thread_name, thread in list(self._child_thread_map.items()):
if name is not None and thread_name is name:
if name is None or thread_name == name:
LOG.debug('%s: Stopping child thread %s',
self.name, thread_name)
thread.kill()