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

8154220: Semi-colon delimited list of catalog files in System property is throwing IllegalArgumentException

Browse source 
Reviewed-by: lancea
This commit is contained in:
Joe Wang 2016-04-28 09:08:01 -07:00
parent 0a3a2c3ebe
commit 2f9ffbd280
5 changed files with 80 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
jaxp/src/java.xml/share/classes/javax/xml/catalog/CatalogFeatures.java
View file

@ -444,13 +444,15 @@ public class CatalogFeatures {
}
} else if (index == Feature.FILES.ordinal()) {
try {
if (Util.verifyAndGetURI(value, null) == null) {
CatalogMessages.reportIAE(new Object[]{value, Feature.FILES.name()}, null);
String[] catalogFile = value.split(";[ ]*");
for (String temp : catalogFile) {
if (Util.verifyAndGetURI(temp, null) == null) {
CatalogMessages.reportIAE(new Object[]{value, Feature.FILES.name()}, null);
}
}
}catch (MalformedURLException | URISyntaxException | IllegalArgumentException ex) {
CatalogMessages.reportIAE(new Object[]{value, Feature.FILES.name()}, ex);
}
}
if (states[index] == null || state.compareTo(states[index]) >= 0) {
values[index] = value;