svn commit: r1374351 - in /hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common: CHANGES.txt src/test/java/org/apache/hadoop/io/TestWritableName.java

[tgraves]

Author: tgraves
Date: Fri Aug 17 16:41:26 2012
New Revision: 1374351

URL: http://svn.apache.org/viewvc?rev=1374351&view=rev
Log:
merge -r 1374348:1374349 from trunk. FIXES: HADOOP-8697

Modified:
    
hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/CHANGES.txt
    
hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestWritableName.java

Modified: 
hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1374351&r1=1374350&r2=1374351&view=diff
==============================================================================
--- 
hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/CHANGES.txt
 (original)
+++ 
hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/CHANGES.txt
 Fri Aug 17 16:41:26 2012
@@ -660,6 +660,9 @@ Release 0.23.3 - UNRELEASED
     HADOOP-8693. TestSecurityUtil fails intermittently with JDK7 (Trevor
     Robinson via tgraves)
 
+    HADOOP-8697. TestWritableName fails intermittently with JDK7 (Trevor
+    Robinson via tgraves)
+
 Release 0.23.2 - UNRELEASED 
 
   NEW FEATURES

Modified: 
hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestWritableName.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestWritableName.java?rev=1374351&r1=1374350&r2=1374351&view=diff
==============================================================================
--- 
hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestWritableName.java
 (original)
+++ 
hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestWritableName.java
 Fri Aug 17 16:41:26 2012
@@ -83,6 +83,7 @@ public class TestWritableName extends Te
     Configuration conf = new Configuration();
     String altName = testName + ".alt";
 
+    WritableName.setName(SimpleWritable.class, testName);
     WritableName.addName(SimpleWritable.class, altName);
 
     Class<?> test = WritableName.getClass(altName, conf);