Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-7118. Fix NPE in Configuration.writeXml. Contributed by Todd Lipcon 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1063613 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Todd Lipcon 2011-01-26 06:59:14 +00:00
parent 448f8dbb9f
commit 160b6fd496
3 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.txt
View File

@ -455,6 +455,8 @@ Release 0.22.0 - Unreleased
HADOOP-7046. Fix Findbugs warning in Configuration. (Po Cheung via shv) HADOOP-7046. Fix Findbugs warning in Configuration. (Po Cheung via shv)
HADOOP-7118. Fix NPE in Configuration.writeXml (todd)
Release 0.21.1 - Unreleased Release 0.21.1 - Unreleased
IMPROVEMENTS IMPROVEMENTS

1
src/java/org/apache/hadoop/conf/Configuration.java
View File

@ -1620,6 +1620,7 @@ private synchronized Document asXmlDocument() throws IOException {
Element conf = doc.createElement("configuration"); Element conf = doc.createElement("configuration");
doc.appendChild(conf); doc.appendChild(conf);
conf.appendChild(doc.createTextNode("\n")); conf.appendChild(doc.createTextNode("\n"));
getProps(); // ensure properties is set
for (Enumeration e = properties.keys(); e.hasMoreElements();) { for (Enumeration e = properties.keys(); e.hasMoreElements();) {
String name = (String)e.nextElement(); String name = (String)e.nextElement();
Object object = properties.get(name); Object object = properties.get(name);

11
src/test/core/org/apache/hadoop/conf/TestConfiguration.java
View File

@ -18,6 +18,7 @@
package org.apache.hadoop.conf; package org.apache.hadoop.conf;
import java.io.BufferedWriter; import java.io.BufferedWriter;
import java.io.ByteArrayOutputStream;
import java.io.File; import java.io.File;
import java.io.FileWriter; import java.io.FileWriter;
import java.io.IOException; import java.io.IOException;
@ -255,6 +256,16 @@ public void testToString() throws IOException {
assertEquals(expectedOutput, conf.toString()); assertEquals(expectedOutput, conf.toString());
} }
public void testWriteXml() throws IOException {
Configuration conf = new Configuration();
ByteArrayOutputStream baos = new ByteArrayOutputStream();
conf.writeXml(baos);
String result = baos.toString();
assertTrue("Result has proper header", result.startsWith(
"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?><configuration>"));
assertTrue("Result has proper footer", result.endsWith("</configuration>"));
}
public void testIncludes() throws Exception { public void testIncludes() throws Exception {
tearDown(); tearDown();
System.out.println("XXX testIncludes"); System.out.println("XXX testIncludes");