You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2016/01/16 04:27:34 UTC
[03/10] hbase git commit: Amend HBASE-14771
RpcServer#getRemoteAddress always returns null
Amend HBASE-14771 RpcServer#getRemoteAddress always returns null
This change has been reported to cause Phoenix's PhoenixIndexRpcSchedulerTest to fail
with a NPE
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/8189b0f2
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/8189b0f2
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/8189b0f2
Branch: refs/heads/0.98
Commit: 8189b0f255023c6d2e10565275979cea23f87e7d
Parents: 21e9074
Author: Andrew Purtell <ap...@apache.org>
Authored: Fri Jan 15 17:32:43 2016 -0800
Committer: Andrew Purtell <ap...@apache.org>
Committed: Fri Jan 15 17:32:46 2016 -0800
----------------------------------------------------------------------
.../src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/8189b0f2/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 aa2616b..458a6b2 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
@@ -2533,7 +2533,7 @@ public class RpcServer implements RpcServerInterface {
*/
public static InetAddress getRemoteIp() {
Call call = CurCall.get();
- if (call != null && call.connection.socket != null) {
+ if (call != null && call.connection != null && call.connection.socket != null) {
return call.connection.socket.getInetAddress();
}
return null;