Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id B1E68200B64 for ; Mon, 18 Jul 2016 17:43:23 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id B0B8F160A6D; Mon, 18 Jul 2016 15:43:23 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 33181160A8E for ; Mon, 18 Jul 2016 17:43:23 +0200 (CEST) Received: (qmail 76117 invoked by uid 500); 18 Jul 2016 15:43:18 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 74829 invoked by uid 99); 18 Jul 2016 15:43:17 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 18 Jul 2016 15:43:17 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 2D838DFAD9; Mon, 18 Jul 2016 15:43:17 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aleksey@apache.org To: commits@cassandra.apache.org Date: Mon, 18 Jul 2016 15:43:42 -0000 Message-Id: <5509a309d8654dfa894cb05eaef62b43@git.apache.org> In-Reply-To: <7fee99cfd26d462ca489c3d7c7c85a22@git.apache.org> References: <7fee99cfd26d462ca489c3d7c7c85a22@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [27/50] cassandra git commit: ninja fix condition to ensure close in ConnectionHandler archived-at: Mon, 18 Jul 2016 15:43:23 -0000 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-3.8 Commit: e983590d303c9c19577b3bd5b5c95adc9f5abb8a Parents: f28409b Author: Yuki Morishita Authored: Fri Jul 8 19:05:06 2016 -0500 Committer: Yuki Morishita 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);