Repository: hbase Updated Branches: refs/heads/master dc2aa7e51 -> 414a7b18b
HBASE-14474 Revert addendum Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/414a7b18 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/414a7b18 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/414a7b18 Branch: refs/heads/master Commit: 414a7b18b12bdda51effcc7074c6134364fedf42 Parents: dc2aa7e Author: tedyu <[email protected]> Authored: Fri Sep 25 15:48:08 2015 -0700 Committer: tedyu <[email protected]> Committed: Fri Sep 25 15:48:08 2015 -0700 ---------------------------------------------------------------------- .../main/java/org/apache/hadoop/hbase/ipc/RpcClientImpl.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/414a7b18/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 92ae24f..cb18952 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,8 +923,9 @@ public class RpcClientImpl extends AbstractRpcClient { // call close outside of the synchronized (outLock) to prevent deadlock - HBASE-14474 if (writeException != null) { - markClosed(writeException); - close(); + if (markClosed(writeException)) { + close(); + } } // We added a call, and may be started the connection close. In both cases, we
