From 6dc33cad75c9581a5008c78b8c0f8181b3c93deb Mon Sep 17 00:00:00 2001
From: Enis Soztutar <enis@apache.org>
Date: Fri, 16 Oct 2015 11:54:22 -0700
Subject: [PATCH] HBASE-14474 Addendum closes connection in writeRequest()
 outside synchronized block

---
 .../main/java/org/apache/hadoop/hbase/ipc/RpcClientImpl.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

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 3fb7061302d..21b257fa80d 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
@@ -926,9 +926,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