You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by dh...@apache.org on 2009/02/17 23:02:58 UTC

svn commit: r745268 - in /hadoop/core/trunk: CHANGES.txt src/core/org/apache/hadoop/conf/Configuration.java

Author: dhruba
Date: Tue Feb 17 22:02:58 2009
New Revision: 745268

URL: http://svn.apache.org/viewvc?rev=745268&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/trunk/CHANGES.txt
    hadoop/core/trunk/src/core/org/apache/hadoop/conf/Configuration.java

Modified: hadoop/core/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/CHANGES.txt?rev=745268&r1=745267&r2=745268&view=diff
==============================================================================
--- hadoop/core/trunk/CHANGES.txt (original)
+++ hadoop/core/trunk/CHANGES.txt Tue Feb 17 22:02:58 2009
@@ -784,6 +784,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

Modified: hadoop/core/trunk/src/core/org/apache/hadoop/conf/Configuration.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/core/org/apache/hadoop/conf/Configuration.java?rev=745268&r1=745267&r2=745268&view=diff
==============================================================================
--- hadoop/core/trunk/src/core/org/apache/hadoop/conf/Configuration.java (original)
+++ hadoop/core/trunk/src/core/org/apache/hadoop/conf/Configuration.java Tue Feb 17 22:02:58 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;