Repository: hadoop Updated Branches: refs/heads/trunk 8c591b8d1 -> 1309c585f
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/1309c585 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/1309c585 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/1309c585 Branch: refs/heads/trunk Commit: 1309c585fb9f632f7c649464ecbe358c5130b142 Parents: 8c591b8 Author: Jonathan Eagles <[email protected]> Authored: Thu Mar 30 14:14:43 2017 -0500 Committer: Jonathan Eagles <[email protected]> Committed: Thu Mar 30 14:14:43 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/1309c585/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 36845e3..2ac52cb 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 @@ -2756,9 +2756,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(); @@ -2795,9 +2792,6 @@ public class Configuration implements Iterable<Map.Entry<String,String>>, } break; case "fallback": - if (!"xi".equals(reader.getPrefix())) { - break; - } fallbackEntered = true; break; case "configuration": @@ -2833,9 +2827,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]
