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 1B653E8BF for ; Wed, 2 Jan 2013 23:09:17 +0000 (UTC) Received: (qmail 91416 invoked by uid 500); 2 Jan 2013 23:09:16 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 91357 invoked by uid 500); 2 Jan 2013 23:09:16 -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 91349 invoked by uid 99); 2 Jan 2013 23:09:16 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Jan 2013 23:09:16 +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; Wed, 02 Jan 2013 23:09:15 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 1BE3B23888D2 for ; Wed, 2 Jan 2013 23:08:56 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1428103 - in /hadoop/common/branches/branch-1-win: CHANGES.branch-1-win.txt src/test/org/apache/hadoop/security/TestSecurityUtil.java Date: Wed, 02 Jan 2013 23:08:55 -0000 To: common-commits@hadoop.apache.org From: suresh@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130102230856.1BE3B23888D2@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: suresh Date: Wed Jan 2 23:08:55 2013 New Revision: 1428103 URL: http://svn.apache.org/viewvc?rev=1428103&view=rev Log: HADOOP-9174. Merge change 1428102 from branch-1 Modified: hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt hadoop/common/branches/branch-1-win/src/test/org/apache/hadoop/security/TestSecurityUtil.java Modified: hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt?rev=1428103&r1=1428102&r2=1428103&view=diff ============================================================================== --- hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt (original) +++ hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt Wed Jan 2 23:08:55 2013 @@ -310,3 +310,5 @@ Branch-hadoop-1-win (branched from branc node is excluded, the nodes in the same nodegroup should also be excluded. (Meng Gong via szetszwo) + HADOOP-9174. TestSecurityUtil fails with Open JDK 7. (Arpit Agarwal via + suresh) Modified: hadoop/common/branches/branch-1-win/src/test/org/apache/hadoop/security/TestSecurityUtil.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1-win/src/test/org/apache/hadoop/security/TestSecurityUtil.java?rev=1428103&r1=1428102&r2=1428103&view=diff ============================================================================== --- hadoop/common/branches/branch-1-win/src/test/org/apache/hadoop/security/TestSecurityUtil.java (original) +++ hadoop/common/branches/branch-1-win/src/test/org/apache/hadoop/security/TestSecurityUtil.java Wed Jan 2 23:08:55 2013 @@ -114,6 +114,8 @@ public class TestSecurityUtil { @Test public void testBuildDTServiceName() { + SecurityUtil.setTokenServiceUseIp(true); + assertEquals("127.0.0.1:123", SecurityUtil.buildDTServiceName(URI.create("test://LocalHost"), 123) ); @@ -130,6 +132,8 @@ public class TestSecurityUtil { @Test public void testBuildTokenServiceSockAddr() { + SecurityUtil.setTokenServiceUseIp(true); + assertEquals("127.0.0.1:123", SecurityUtil.buildTokenService(new InetSocketAddress("LocalHost", 123)).toString() );