hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e...@apache.org
Subject hbase git commit: HBASE-14474 Addendum closes connection in writeRequest() outside synchronized block
Date Fri, 16 Oct 2015 19:22:05 GMT
Repository: hbase
Updated Branches:
  refs/heads/branch-1.1 c14233b4a -> f2b059ea7


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/f2b059ea
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/f2b059ea
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/f2b059ea

Branch: refs/heads/branch-1.1
Commit: f2b059ea7a36866079f1babc13d2d561bcf4e42b
Parents: c14233b
Author: Enis Soztutar <enis@apache.org>
Authored: Fri Oct 16 11:54:22 2015 -0700
Committer: Enis Soztutar <enis@apache.org>
Committed: Fri Oct 16 12:20:44 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/f2b059ea/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 39b3010..95e7a1f 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
@@ -919,9 +919,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