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

…hutdown Prevent access through 'NoneType' when closing activity_stream
jupyter · Sep 13, 2018 · 8ced0dd · 8ced0dd
2 parents f81ec30 + 2d688f2
commit 8ced0dd
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/notebook/services/kernels/kernelmanager.py b/notebook/services/kernels/kernelmanager.py
@@ -272,8 +272,9 @@ def shutdown_kernel(self, kernel_id, now=False):
         """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()