Repository: cassandra Updated Branches: refs/heads/cassandra-2.2 f28409bb9 -> e983590d3 refs/heads/cassandra-3.0 a227cc61c -> 2fa44cd88 refs/heads/cassandra-3.9 c1dcc9ce4 -> 1417a516c refs/heads/trunk cb9865c94 -> 09720f81d
ninja fix condition to ensure close in ConnectionHandler Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e983590d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e983590d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e983590d Branch: refs/heads/cassandra-2.2 Commit: e983590d303c9c19577b3bd5b5c95adc9f5abb8a Parents: f28409b Author: Yuki Morishita <yu...@apache.org> Authored: Fri Jul 8 19:05:06 2016 -0500 Committer: Yuki Morishita <yu...@apache.org> Committed: Fri Jul 8 19:05:06 2016 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/streaming/ConnectionHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e983590d/src/java/org/apache/cassandra/streaming/ConnectionHandler.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/streaming/ConnectionHandler.java b/src/java/org/apache/cassandra/streaming/ConnectionHandler.java index 364435e..d3d8ed2 100644 --- a/src/java/org/apache/cassandra/streaming/ConnectionHandler.java +++ b/src/java/org/apache/cassandra/streaming/ConnectionHandler.java @@ -233,7 +233,7 @@ public class ConnectionHandler protected void signalCloseDone() { - if (closeFuture == null) + if (!isClosed()) close(); closeFuture.get().set(null);
