svn commit: r1428102 - in /hadoop/common/branches/branch-1: CHANGES.txt src/test/org/apache/hadoop/security/TestSecurityUtil.java

[suresh]

Author: suresh
Date: Wed Jan  2 23:02:38 2013
New Revision: 1428102

URL: http://svn.apache.org/viewvc?rev=1428102&view=rev
Log:
HADOOP-9174. TestSecurityUtil fails with Open JDK 7. Contributed by Arpit 
Agarwal.

Modified:
    hadoop/common/branches/branch-1/CHANGES.txt
    
hadoop/common/branches/branch-1/src/test/org/apache/hadoop/security/TestSecurityUtil.java

Modified: hadoop/common/branches/branch-1/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/CHANGES.txt?rev=1428102&r1=1428101&r2=1428102&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1/CHANGES.txt Wed Jan  2 23:02:38 2013
@@ -373,6 +373,9 @@ Release 1.2.0 - unreleased
     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)
+
 Release 1.1.2 - Unreleased
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/branches/branch-1/src/test/org/apache/hadoop/security/TestSecurityUtil.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/test/org/apache/hadoop/security/TestSecurityUtil.java?rev=1428102&r1=1428101&r2=1428102&view=diff
==============================================================================
--- 
hadoop/common/branches/branch-1/src/test/org/apache/hadoop/security/TestSecurityUtil.java
 (original)
+++ 
hadoop/common/branches/branch-1/src/test/org/apache/hadoop/security/TestSecurityUtil.java
 Wed Jan  2 23:02:38 2013
@@ -112,6 +112,8 @@ public class TestSecurityUtil {
 
   @Test
   public void testBuildDTServiceName() {
+    SecurityUtil.setTokenServiceUseIp(true);
+
     assertEquals("127.0.0.1:123",
         SecurityUtil.buildDTServiceName(URI.create("test://LocalHost"), 123)
     );
@@ -128,6 +130,8 @@ public class TestSecurityUtil {
   
   @Test
   public void testBuildTokenServiceSockAddr() {
+    SecurityUtil.setTokenServiceUseIp(true);
+
     assertEquals("127.0.0.1:123",
         SecurityUtil.buildTokenService(new InetSocketAddress("LocalHost", 
123)).toString()
     );