Merge branch '2.0' into 2.1

olim7t · olim7t · commit 9bedc0d850bb · 2015-12-07T17:31:29.000+01:00
diff --git a/changelog/README.md b/changelog/README.md
@@ -12,7 +12,6 @@
 Merged from 2.0 branch:
 
 - [bug] JAVA-994: Don't call on(Up|Down|Add|Remove) methods if Cluster is closed/closing.
-- [bug] JAVA-995: Defunct connection even if initializing.
 
 
 ### 2.1.9
@@ -353,8 +352,6 @@ Merged from 2.0 branch: everything up to 2.0.3 (included), and the following.
 ### 2.0.13 (in progress)
 
 - [bug] JAVA-994: Don't call on(Up|Down|Add|Remove) methods if Cluster is closed/closing.
-- [bug] JAVA-995: Defunct connection even if initializing.
-
 
 ### 2.0.12
 
diff --git a/driver-core/src/main/java/com/datastax/driver/core/Connection.java b/driver-core/src/main/java/com/datastax/driver/core/Connection.java
@@ -1063,7 +1063,7 @@ private class ChannelCloseListener implements ChannelFutureListener {
         public void operationComplete(ChannelFuture future) throws Exception {
             // If we've closed the channel client side then we don't really want to defunct the connection, but
             // if there is remaining thread waiting on us, we still want to wake them up
-            if (isClosed()) {
+            if (!isInitialized || isClosed()) {
                 dispatcher.errorOutAllHandler(new TransportException(address, "Channel has been closed"));
                 // we still want to force so that the future completes
                 Connection.this.closeAsync().force();
