Repository: hadoop Updated Branches: refs/heads/branch-2 a52b30f7e -> 60e65a3e5
HADOOP-14216. Addendum to Improve Configuration XML Parsing Performance (jeagles) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/60e65a3e Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/60e65a3e Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/60e65a3e Branch: refs/heads/branch-2 Commit: 60e65a3e551ed96c39d21b2a4b5cea17289e40d9 Parents: a52b30f Author: Jonathan Eagles <[email protected]> Authored: Thu Mar 30 14:15:37 2017 -0500 Committer: Jonathan Eagles <[email protected]> Committed: Thu Mar 30 14:15:37 2017 -0500 ---------------------------------------------------------------------- .../src/main/java/org/apache/hadoop/conf/Configuration.java | 9 --------- 1 file changed, 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/60e65a3e/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 fee84c2..df28b96 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 @@ -2678,9 +2678,6 @@ public class Configuration implements Iterable<Map.Entry<String,String>>, token.setLength(0); break; case "include": - if (!"xi".equals(reader.getPrefix())) { - break; - } // Determine href for xi:include String confInclude = null; attrCount = reader.getAttributeCount(); @@ -2717,9 +2714,6 @@ public class Configuration implements Iterable<Map.Entry<String,String>>, } break; case "fallback": - if (!"xi".equals(reader.getPrefix())) { - break; - } fallbackEntered = true; break; case "configuration": @@ -2755,9 +2749,6 @@ public class Configuration implements Iterable<Map.Entry<String,String>>, confSource.add(StringInterner.weakIntern(token.toString())); break; case "include": - if (!"xi".equals(reader.getPrefix())) { - break; - } if (fallbackAllowed && !fallbackEntered) { throw new IOException("Fetch fail on include with no " + "fallback while loading '" + name + "'"); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
