Apache/hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
(cherry picked from commit b07e68b02a34d272114dda4194992a847928aef8)
This commit is contained in:
Arun Suresh 2017-11-13 14:03:50 -08:00
parent c2f479c248
commit f6de2b741e
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
View File

@ -2936,7 +2936,8 @@ private Resource loadResource(Properties properties,
// xi:include are treated as inline and retain current source // xi:include are treated as inline and retain current source
URL include = getResource(confInclude); URL include = getResource(confInclude);
if (include != null) { if (include != null) {
Resource classpathResource = new Resource(include, name); Resource classpathResource = new Resource(include, name,
wrapper.isParserRestricted());
loadResource(properties, classpathResource, quiet); loadResource(properties, classpathResource, quiet);
} else { } else {
URL url; URL url;
@ -2957,7 +2958,8 @@ private Resource loadResource(Properties properties,
} }
url = href.toURI().toURL(); url = href.toURI().toURL();
} }
Resource uriResource = new Resource(url, name); Resource uriResource = new Resource(url, name,
wrapper.isParserRestricted());
loadResource(properties, uriResource, quiet); loadResource(properties, uriResource, quiet);
} }
break; break;