JAVA-994: Don't call on(Up|Down|Add|Remove) if Cluster is closed.

tolbertam · tolbertam · commit ed9c2ee819f7 · 2015-11-18T16:00:02.000-05:00
diff --git a/changelog/README.md b/changelog/README.md
@@ -1,5 +1,9 @@
 ## Changelog
 
+### 2.0.13 (in progress)
+
+- [bug] JAVA-994: Don't call on(Up|Down|Add|Remove) methods if Cluster is closed/closing.
+
 ### 2.0.12
 
 - [bug] JAVA-950: Fix Cluster.connect with a case-sensitive keyspace.
diff --git a/driver-core/src/main/java/com/datastax/driver/core/Cluster.java b/driver-core/src/main/java/com/datastax/driver/core/Cluster.java
@@ -1608,12 +1608,16 @@ void logClusterNameMismatch(Host host, String expectedClusterName, String actual
         }
 
         public ListenableFuture<?> triggerOnUp(final Host host) {
-            return executor.submit(new ExceptionCatchingRunnable() {
-                @Override
-                public void runMayThrow() throws InterruptedException, ExecutionException {
-                    onUp(host, null);
-                }
-            });
+            if (!isClosed()) {
+                return executor.submit(new ExceptionCatchingRunnable() {
+                    @Override
+                    public void runMayThrow() throws InterruptedException, ExecutionException {
+                        onUp(host, null);
+                    }
+                });
+            } else {
+                return MoreFutures.VOID_SUCCESS;
+            }
         }
 
         // Use triggerOnUp unless you're sure you want to run this on the current thread.
@@ -1723,12 +1727,16 @@ public ListenableFuture<?> triggerOnDown(final Host host, boolean startReconnect
         }
 
         public ListenableFuture<?> triggerOnDown(final Host host, final boolean isHostAddition, final boolean startReconnection) {
-            return executor.submit(new ExceptionCatchingRunnable() {
-                @Override
-                public void runMayThrow() throws InterruptedException, ExecutionException {
-                    onDown(host, isHostAddition, startReconnection);
-                }
-            });
+            if(!isClosed()) {
+                return executor.submit(new ExceptionCatchingRunnable() {
+                    @Override
+                    public void runMayThrow() throws InterruptedException, ExecutionException {
+                        onDown(host, isHostAddition, startReconnection);
+                    }
+                });
+            } else {
+                return MoreFutures.VOID_SUCCESS;
+            }
         }
 
         // Use triggerOnDown unless you're sure you want to run this on the current thread.
@@ -1883,12 +1891,16 @@ protected boolean onAuthenticationException(AuthenticationException e, long next
         }
 
         public ListenableFuture<?> triggerOnAdd(final Host host) {
-            return executor.submit(new ExceptionCatchingRunnable() {
-                @Override
-                public void runMayThrow() throws InterruptedException, ExecutionException {
-                    onAdd(host, null);
-                }
-            });
+            if (!isClosed()) {
+                return executor.submit(new ExceptionCatchingRunnable() {
+                    @Override
+                    public void runMayThrow() throws InterruptedException, ExecutionException {
+                        onAdd(host, null);
+                    }
+                });
+            } else {
+                return MoreFutures.VOID_SUCCESS;
+            }
         }
 
         // Use triggerOnAdd unless you're sure you want to run this on the current thread.
@@ -1988,12 +2000,16 @@ private void onAdd(final Host host, Connection reusedConnection) throws Interrup
         }
 
         public ListenableFuture<?> triggerOnRemove(final Host host) {
-            return executor.submit(new ExceptionCatchingRunnable() {
-                @Override
-                public void runMayThrow() throws InterruptedException, ExecutionException {
-                    onRemove(host);
-                }
-            });
+            if (!isClosed()) {
+                return executor.submit(new ExceptionCatchingRunnable() {
+                    @Override
+                    public void runMayThrow() throws InterruptedException, ExecutionException {
+                        onRemove(host);
+                    }
+                });
+            } else {
+                return MoreFutures.VOID_SUCCESS;
+            }
         }
 
         // Use triggerOnRemove unless you're sure you want to run this on the current thread.
