archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-20 11:04:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
David Dehaven 2016-06-06 13:16:44 -07:00
commit b7df5697db
1589 changed files with 229851 additions and 128707 deletions
Download patch file Download diff file Expand all files Collapse all files

1
jaxp/src/java.xml/share/classes/javax/xml/catalog/CatalogResolverImpl.java
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)));