Repository: hadoop Updated Branches: refs/heads/branch-3.0 c2f479c24 -> f6de2b741
Addendum patch for Configuration fix. (Jason Lowe via asuresh) (cherry picked from commit b07e68b02a34d272114dda4194992a847928aef8) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/f6de2b74 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f6de2b74 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f6de2b74 Branch: refs/heads/branch-3.0 Commit: f6de2b741ed75aecdd5244ce4a360b9780b53251 Parents: c2f479c Author: Arun Suresh <asur...@apache.org> Authored: Mon Nov 13 14:03:50 2017 -0800 Committer: Arun Suresh <asur...@apache.org> Committed: Mon Nov 13 14:05:41 2017 -0800 ---------------------------------------------------------------------- .../src/main/java/org/apache/hadoop/conf/Configuration.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/f6de2b74/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java ---------------------------------------------------------------------- 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 6c061a4..18e6e6e 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 @@ -2936,7 +2936,8 @@ public class Configuration implements Iterable<Map.Entry<String,String>>, // 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; @@ -2957,7 +2958,8 @@ public class Configuration implements Iterable<Map.Entry<String,String>>, } url = href.toURI().toURL(); } - Resource uriResource = new Resource(url, name); + Resource uriResource = new Resource(url, name, + wrapper.isParserRestricted()); loadResource(properties, uriResource, quiet); } break; --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
