You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by nk...@apache.org on 2014/08/20 12:14:52 UTC

git commit: HBASE-11744 RpcServer code should not use a collection from netty internal

Repository: hbase
Updated Branches:
  refs/heads/master 062f6a6aa -> c308c37b2


HBASE-11744 RpcServer code should not use a collection from netty internal


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/c308c37b
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/c308c37b
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/c308c37b

Branch: refs/heads/master
Commit: c308c37b23a463366878e027e7f5f10c800097ff
Parents: 062f6a6
Author: Nicolas Liochon <nk...@gmail.com>
Authored: Wed Aug 20 12:14:40 2014 +0200
Committer: Nicolas Liochon <nk...@gmail.com>
Committed: Wed Aug 20 12:14:40 2014 +0200

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


http://git-wip-us.apache.org/repos/asf/hbase/blob/c308c37b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java
index 7d9c569..4725b3c 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java
@@ -19,7 +19,6 @@
 package org.apache.hadoop.hbase.ipc;
 
 import static org.apache.hadoop.fs.CommonConfigurationKeysPublic.HADOOP_SECURITY_AUTHORIZATION;
-import io.netty.util.internal.ConcurrentSet;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -53,6 +52,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Random;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentLinkedDeque;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -839,7 +839,8 @@ public class RpcServer implements RpcServerInterface {
   // Sends responses of RPC back to clients.
   protected class Responder extends Thread {
     private final Selector writeSelector;
-    private final ConcurrentSet<Connection> writingCons = new ConcurrentSet<Connection>();
+    private final Set<Connection> writingCons =
+        Collections.newSetFromMap(new ConcurrentHashMap<Connection, Boolean>());
 
     Responder() throws IOException {
       this.setName("RpcServer.responder");