From b07e68b02a34d272114dda4194992a847928aef8 Mon Sep 17 00:00:00 2001 From: Arun Suresh Date: Mon, 13 Nov 2017 14:03:50 -0800 Subject: [PATCH] Addendum patch for Configuration fix. (Jason Lowe via asuresh) --- .../src/main/java/org/apache/hadoop/conf/Configuration.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java index dfbeec7fc4d..fce21949be3 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java @@ -2962,7 +2962,8 @@ private Resource loadResource(Properties properties, // xi:include are treated as inline and retain current source URL include = getResource(confInclude); if (include != null) { - Resource classpathResource = new Resource(include, name); + Resource classpathResource = new Resource(include, name, + wrapper.isParserRestricted()); loadResource(properties, classpathResource, quiet); } else { URL url; @@ -2983,7 +2984,8 @@ private Resource loadResource(Properties properties, } url = href.toURI().toURL(); } - Resource uriResource = new Resource(url, name); + Resource uriResource = new Resource(url, name, + wrapper.isParserRestricted()); loadResource(properties, uriResource, quiet); } break;