Index: hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/HBaseServer.java =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/HBaseServer.java (revision 1363706) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/HBaseServer.java (working copy) @@ -223,8 +221,11 @@ * @return String */ public static String getRemoteAddress() { - InetAddress addr = getRemoteIp(); - return (addr == null) ? null : addr.getHostAddress(); + Call call = CurCall.get(); + if (call != null) { + return call.connection.getHostAddress(); + } + return null; } protected String bindAddress;