Merge pull request #3907 from kevin-bates/prevent-AttributeError-on-shutdown

Prevent access through 'NoneType' when closing activity_stream
8 years ago · 8ced0dd367
parent f81ec30b62 2d688f2071
commit 8ced0dd367
1 changed files with 3 additions and 2 deletions
--- a/notebook/services/kernels/kernelmanager.py
+++ b/notebook/services/kernels/kernelmanager.py
@ -272,8 +272,9 @@ class MappingKernelManager(MultiKernelManager):
        """Shutdown a kernel by kernel_id"""
        self._check_kernel_id(kernel_id)
        kernel = self._kernels[kernel_id]
-        kernel._activity_stream.close()
-        kernel._activity_stream = None
+        if kernel._activity_stream:
+            kernel._activity_stream.close()
+            kernel._activity_stream = None
        self.stop_buffering(kernel_id)
        self._kernel_connections.pop(kernel_id, None)
        self.last_kernel_activity = utcnow()