Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id CAEF148FF for ; Tue, 17 May 2011 17:41:36 +0000 (UTC) Received: (qmail 18442 invoked by uid 500); 17 May 2011 17:41:36 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 18418 invoked by uid 500); 17 May 2011 17:41:36 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 18411 invoked by uid 99); 17 May 2011 17:41:36 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 17 May 2011 17:41:36 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 17 May 2011 17:41:35 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 610A62388901; Tue, 17 May 2011 17:41:15 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1104426 - in /hadoop/common/trunk: CHANGES.txt src/java/org/apache/hadoop/ipc/Server.java Date: Tue, 17 May 2011 17:41:15 -0000 To: common-commits@hadoop.apache.org From: szetszwo@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110517174115.610A62388901@eris.apache.org> Author: szetszwo Date: Tue May 17 17:41:14 2011 New Revision: 1104426 URL: http://svn.apache.org/viewvc?rev=1104426&view=rev Log: HADOOP-7282. ipc.Server.getRemoteIp() may return null. Contributed by John George Modified: hadoop/common/trunk/CHANGES.txt hadoop/common/trunk/src/java/org/apache/hadoop/ipc/Server.java Modified: hadoop/common/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/trunk/CHANGES.txt?rev=1104426&r1=1104425&r2=1104426&view=diff ============================================================================== --- hadoop/common/trunk/CHANGES.txt (original) +++ hadoop/common/trunk/CHANGES.txt Tue May 17 17:41:14 2011 @@ -226,6 +226,9 @@ Trunk (unreleased changes) HADOOP-7292. Fix racy test case TestSinkQueue. (Luke Lu via todd) + HADOOP-7282. ipc.Server.getRemoteIp() may return null. (John George + via szetszwo) + Release 0.22.0 - Unreleased INCOMPATIBLE CHANGES Modified: hadoop/common/trunk/src/java/org/apache/hadoop/ipc/Server.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/ipc/Server.java?rev=1104426&r1=1104425&r2=1104426&view=diff ============================================================================== --- hadoop/common/trunk/src/java/org/apache/hadoop/ipc/Server.java (original) +++ hadoop/common/trunk/src/java/org/apache/hadoop/ipc/Server.java Tue May 17 17:41:14 2011 @@ -154,7 +154,7 @@ public abstract class Server { public static InetAddress getRemoteIp() { Call call = CurCall.get(); if (call != null) { - return call.connection.socket.getInetAddress(); + return call.connection.getHostInetAddress(); } return null; } @@ -166,6 +166,13 @@ public abstract class Server { return (addr == null) ? null : addr.getHostAddress(); } + + /** Return true if the invocation was through an RPC. + */ + public static boolean isRpcInvocation() { + return CurCall.get() != null; + } + private String bindAddress; private int port; // port we listen on private int handlerCount; // number of handler threads