Add methods to check if a cluster/session instance if closed

Sylvain Lebresne · Sylvain Lebresne · commit 06eacf5b68bc · 2014-03-03T17:44:17.000+01:00
JAVA-114 #fixes
diff --git a/driver-core/CHANGELOG.rst b/driver-core/CHANGELOG.rst
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+1.0.7:
+------
+
+- [new] Add method to check if a Cluster/Session instance has been closed already (JAVA-114)
+
 1.0.6:
 ------
 
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
@@ -305,6 +305,16 @@ public boolean shutdown(long timeout, TimeUnit unit) {
         }
     }
 
+    /**
+     * Whether shutdown has been called on this Cluster instance.
+     *
+     * @return {@code true} if {@code shutdown} has been called on this instance,
+     * {@code false} otherwise.
+     */
+    public boolean isShutdown() {
+        return manager.isShutdown.get();
+    }
+
     /**
      * Initializer for {@link Cluster} instances.
      * <p>
diff --git a/driver-core/src/main/java/com/datastax/driver/core/Session.java b/driver-core/src/main/java/com/datastax/driver/core/Session.java
@@ -228,6 +228,13 @@ public interface Session {
      */
     public boolean shutdown(long timeout, TimeUnit unit);
 
+    /**
+     * Whether shutdown has been called on this Session instance.
+     *
+     * @return {@code true} if this instance is shut down, {@code false} otherwise.
+     */
+    public boolean isShutdown();
+
     /**
      * Returns the {@code Cluster} object this session is part of.
      *
diff --git a/driver-core/src/main/java/com/datastax/driver/core/SessionManager.java b/driver-core/src/main/java/com/datastax/driver/core/SessionManager.java
@@ -155,6 +155,10 @@ public boolean shutdown(long timeout, TimeUnit unit) {
         }
     }
 
+    public boolean isShutdown() {
+        return isShutdown.get();
+    }
+
     public Cluster getCluster() {
         return cluster;
     }

Original file line number	Diff line number	Diff line change
`@@ -155,6 +155,10 @@ public boolean shutdown(long timeout, TimeUnit unit) {`
`155`	`155`	`}`
`156`	`156`	`}`
`157`	`157`
	`158`	`+ public boolean isShutdown() {`
	`159`	`+ return isShutdown.get();`
	`160`	`+ }`
	`161`	`+`
`158`	`162`	`public Cluster getCluster() {`
`159`	`163`	`return cluster;`
`160`	`164`	`}`