8150187: NPE expected if the system identifier is null for CatalogResolver

Reviewed-by: rriggs, lancea
This commit is contained in:
Joe Wang 2016-06-03 11:38:38 -07:00
parent 46b0a616ea
commit 1023eb3584
3 changed files with 30 additions and 3 deletions

View file

@ -51,6 +51,7 @@ final class CatalogResolverImpl implements CatalogResolver {
@Override
public InputSource resolveEntity(String publicId, String systemId) {
CatalogMessages.reportNPEOnNull("systemId", systemId);
//Normalize publicId and systemId
systemId = Normalizer.normalizeURI(Util.getNotNullOrEmpty(systemId));
publicId = Normalizer.normalizePublicId(Normalizer.decodeURN(Util.getNotNullOrEmpty(publicId)));