Return-Path: X-Original-To: apmail-hbase-commits-archive@www.apache.org Delivered-To: apmail-hbase-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 728CC1863A for ; Fri, 25 Sep 2015 22:18:26 +0000 (UTC) Received: (qmail 27314 invoked by uid 500); 25 Sep 2015 22:18:26 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 27274 invoked by uid 500); 25 Sep 2015 22:18:26 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 27265 invoked by uid 99); 25 Sep 2015 22:18:26 -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; Fri, 25 Sep 2015 22:18:26 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 25702E01E0; Fri, 25 Sep 2015 22:18:26 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tedyu@apache.org To: commits@hbase.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: hbase git commit: HBASE-14474 Addendum closes connection in writeRequest() outside synchronized block Date: Fri, 25 Sep 2015 22:18:26 +0000 (UTC) Repository: hbase Updated Branches: refs/heads/master 085fd765a -> dc2aa7e51 HBASE-14474 Addendum closes connection in writeRequest() outside synchronized block Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/dc2aa7e5 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/dc2aa7e5 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/dc2aa7e5 Branch: refs/heads/master Commit: dc2aa7e513a5c9ca1cd748b5d28a5109b37dee45 Parents: 085fd76 Author: tedyu Authored: Fri Sep 25 15:18:21 2015 -0700 Committer: tedyu Committed: Fri Sep 25 15:18:21 2015 -0700 ---------------------------------------------------------------------- .../main/java/org/apache/hadoop/hbase/ipc/RpcClientImpl.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/dc2aa7e5/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcClientImpl.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcClientImpl.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcClientImpl.java index cb18952..92ae24f 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcClientImpl.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcClientImpl.java @@ -923,9 +923,8 @@ public class RpcClientImpl extends AbstractRpcClient { // call close outside of the synchronized (outLock) to prevent deadlock - HBASE-14474 if (writeException != null) { - if (markClosed(writeException)) { - close(); - } + markClosed(writeException); + close(); } // We added a call, and may be started the connection close. In both cases, we