Fix is_shutdown check when running in executor

2014-05-28 18:37:22 -05:00
parent e1af5b3fb5
commit 84682187d8
2 changed files with 10 additions and 1 deletions
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,3 +1,12 @@
+2.0.1
+=====
+May 28, 2014
+
+Bug Fixes
+---------
+* Fix check for Cluster.is_shutdown in in @run_in_executor
+  decorator
+
 2.0.0
 =====
 May 28, 2014
--- a/cassandra/cluster.py
+++ b/cassandra/cluster.py
@@ -130,7 +130,7 @@ def run_in_executor(f):
    @wraps(f)
    def new_f(self, *args, **kwargs):

-        if self._is_shutdown:
+        if self.is_shutdown:
            return
        try:
            future = self.executor.submit(f, self, *args, **kwargs)