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 as...@apache.org on 2017/11/13 21:50:09 UTC
hadoop git commit: Addendum patch for Configuration fix. (Jason Lowe
via asuresh)
Repository: hadoop
Updated Branches:
refs/heads/branch-2 30ab9b6ae -> 4e847d63a
Addendum patch for Configuration fix. (Jason Lowe via asuresh)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/4e847d63
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/4e847d63
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/4e847d63
Branch: refs/heads/branch-2
Commit: 4e847d63a39268d8a34e0f22ddb5e40c5ef71e3a
Parents: 30ab9b6
Author: Arun Suresh <as...@apache.org>
Authored: Mon Nov 13 13:49:08 2017 -0800
Committer: Arun Suresh <as...@apache.org>
Committed: Mon Nov 13 13:49:08 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/4e847d63/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 2532570..283308b 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
@@ -2852,7 +2852,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;
@@ -2873,7 +2874,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-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org