hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From asur...@apache.org
Subject hadoop git commit: Addendum patch for Configuration fix. (Jason Lowe via asuresh)
Date Mon, 13 Nov 2017 21:51:30 GMT
Repository: hadoop
Updated Branches:
  refs/heads/branch-2.9.0 1eb05c1dd -> 9a89a3e0b


Addendum patch for Configuration fix. (Jason Lowe via asuresh)

(cherry picked from commit 4e847d63a39268d8a34e0f22ddb5e40c5ef71e3a)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/9a89a3e0
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/9a89a3e0
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/9a89a3e0

Branch: refs/heads/branch-2.9.0
Commit: 9a89a3e0b09a2eae6aabadd510fa48c5e18c0dcc
Parents: 1eb05c1
Author: Arun Suresh <asuresh@apache.org>
Authored: Mon Nov 13 13:49:08 2017 -0800
Committer: Arun Suresh <asuresh@apache.org>
Committed: Mon Nov 13 13:51:13 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/9a89a3e0/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


Mime
View raw message