svn commit: r745269 - in /hadoop/core/branches/branch-0.20: CHANGES.txt src/core/org/apache/hadoop/conf/Configuration.java

[dhruba]

Author: dhruba
Date: Tue Feb 17 22:04:08 2009
New Revision: 745269

URL: http://svn.apache.org/viewvc?rev=745269&view=rev
Log:
HADOOP-5254. The Configuration class should be able to work with XML
parsers that do not support xmlinclude. (Steve Loughran via dhruba)


Modified:
    hadoop/core/branches/branch-0.20/CHANGES.txt   (contents, props changed)
    
hadoop/core/branches/branch-0.20/src/core/org/apache/hadoop/conf/Configuration.java

Modified: hadoop/core/branches/branch-0.20/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.20/CHANGES.txt?rev=745269&r1=745268&r2=745269&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.20/CHANGES.txt (original)
+++ hadoop/core/branches/branch-0.20/CHANGES.txt Tue Feb 17 22:04:08 2009
@@ -604,6 +604,9 @@
     HADOOP-5211. Fix check for job completion in TestSetupAndCleanupFailure.
     (enis)
 
+    HADOOP-5254. The Configuration class should be able to work with XML
+    parsers that do not support xmlinclude. (Steve Loughran via dhruba)
+
 Release 0.19.1 - Unreleased
 
   IMPROVEMENTS

Propchange: hadoop/core/branches/branch-0.20/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 17 22:04:08 2009
@@ -1,3 +1,3 @@
 /hadoop/core/branches/branch-0.18/CHANGES.txt:727226
 /hadoop/core/branches/branch-0.19/CHANGES.txt:713112
-/hadoop/core/trunk/CHANGES.txt:727001,727117,727191,727212,727228,727255,727869,728187,729052,729987,732385,732572,732777,732838,732869,733887,734870,734916,735082,736426,738602,738697,739416,740077,740157,741703,741762,743296,743745,743816,743892,744894,745180
+/hadoop/core/trunk/CHANGES.txt:727001,727117,727191,727212,727228,727255,727869,728187,729052,729987,732385,732572,732777,732838,732869,733887,734870,734916,735082,736426,738602,738697,739416,740077,740157,741703,741762,743296,743745,743816,743892,744894,745180,745268

Modified: 
hadoop/core/branches/branch-0.20/src/core/org/apache/hadoop/conf/Configuration.java
URL: 
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.20/src/core/org/apache/hadoop/conf/Configuration.java?rev=745269&r1=745268&r2=745269&view=diff
==============================================================================
--- 
hadoop/core/branches/branch-0.20/src/core/org/apache/hadoop/conf/Configuration.java
 (original)
+++ 
hadoop/core/branches/branch-0.20/src/core/org/apache/hadoop/conf/Configuration.java
 Tue Feb 17 22:04:08 2009
@@ -1049,7 +1049,14 @@
 
       //allow includes in the xml file
       docBuilderFactory.setNamespaceAware(true);
-      docBuilderFactory.setXIncludeAware(true);
+      try {
+          docBuilderFactory.setXIncludeAware(true);
+      } catch (UnsupportedOperationException e) {
+        LOG.error("Failed to set setXIncludeAware(true) for parser "
+                + docBuilderFactory
+                + ":" + e,
+                e);
+      }
       DocumentBuilder builder = docBuilderFactory.newDocumentBuilder();
       Document doc = null;
       Element root = null;