merge -r 1374348:1374349 from trunk. FIXES: HADOOP-8697

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1374350 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Thomas Graves 2012-08-17 16:40:29 +00:00
parent a8f10869a8
commit d2902a2ab5
2 changed files with 4 additions and 0 deletions

View File

@ -744,6 +744,9 @@ Release 0.23.3 - UNRELEASED
HADOOP-8693. TestSecurityUtil fails intermittently with JDK7 (Trevor HADOOP-8693. TestSecurityUtil fails intermittently with JDK7 (Trevor
Robinson via tgraves) Robinson via tgraves)
HADOOP-8697. TestWritableName fails intermittently with JDK7 (Trevor
Robinson via tgraves)
Release 0.23.2 - UNRELEASED Release 0.23.2 - UNRELEASED
NEW FEATURES NEW FEATURES

View File

@ -83,6 +83,7 @@ public class TestWritableName extends TestCase {
Configuration conf = new Configuration(); Configuration conf = new Configuration();
String altName = testName + ".alt"; String altName = testName + ".alt";
WritableName.setName(SimpleWritable.class, testName);
WritableName.addName(SimpleWritable.class, altName); WritableName.addName(SimpleWritable.class, altName);
Class<?> test = WritableName.getClass(altName, conf); Class<?> test = WritableName.getClass(altName, conf);