Merge branch '2.0' into 2.1

olim7t · olim7t · commit 2f09ff9c67ac · 2015-06-18T10:50:26.000+02:00
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
@@ -1587,7 +1587,7 @@ private void onUp(final Host host, Connection reusedConnection) throws Interrupt
                     } catch (ExecutionException e) {
                         Throwable t = e.getCause();
                         // That future is not really supposed to throw unexpected exceptions
-                        if (!(t instanceof InterruptedException))
+                        if (!(t instanceof InterruptedException) && !(t instanceof CancellationException))
                             logger.error("Unexpected error while marking node UP: while this shouldn't happen, this shouldn't be critical", t);
                     }
 
@@ -1858,7 +1858,7 @@ private void onAdd(final Host host, Connection reusedConnection) throws Interrup
                     } catch (ExecutionException e) {
                         Throwable t = e.getCause();
                         // That future is not really supposed to throw unexpected exceptions
-                        if (!(t instanceof InterruptedException))
+                        if (!(t instanceof InterruptedException) && !(t instanceof CancellationException))
                             logger.error("Unexpected error while adding node: while this shouldn't happen, this shouldn't be critical", t);
                     }
 
