hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From te...@apache.org
Subject hbase git commit: HBASE-14474 Addendum closes connection in writeRequest() outside synchronized block
Date Fri, 25 Sep 2015 22:18:26 GMT
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 <yuzhihong@gmail.com>
Authored: Fri Sep 25 15:18:21 2015 -0700
Committer: tedyu <yuzhihong@gmail.com>
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


Mime
View raw message