HADOOP-14216. Addendum to Improve Configuration XML Parsing Performance (jeagles)

This commit is contained in:
Jonathan Eagles 2017-03-30 14:14:43 -05:00
parent 8c591b8d19
commit 1309c585fb

View File

@ -2756,9 +2756,6 @@ private Resource loadResource(Properties properties,
token.setLength(0); token.setLength(0);
break; break;
case "include": case "include":
if (!"xi".equals(reader.getPrefix())) {
break;
}
// Determine href for xi:include // Determine href for xi:include
String confInclude = null; String confInclude = null;
attrCount = reader.getAttributeCount(); attrCount = reader.getAttributeCount();
@ -2795,9 +2792,6 @@ private Resource loadResource(Properties properties,
} }
break; break;
case "fallback": case "fallback":
if (!"xi".equals(reader.getPrefix())) {
break;
}
fallbackEntered = true; fallbackEntered = true;
break; break;
case "configuration": case "configuration":
@ -2833,9 +2827,6 @@ private Resource loadResource(Properties properties,
confSource.add(StringInterner.weakIntern(token.toString())); confSource.add(StringInterner.weakIntern(token.toString()));
break; break;
case "include": case "include":
if (!"xi".equals(reader.getPrefix())) {
break;
}
if (fallbackAllowed && !fallbackEntered) { if (fallbackAllowed && !fallbackEntered) {
throw new IOException("Fetch fail on include with no " throw new IOException("Fetch fail on include with no "
+ "fallback while loading '" + name + "'"); + "fallback while loading '" + name + "'");