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

8146237: PREFER from Features API taking precedence over catalog file

Browse source 
Reviewed-by: lancea
This commit is contained in:
Joe Wang 2016-02-17 16:32:51 -08:00
parent ca3da12f5a
commit ffa5558ae1
3 changed files with 35 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
jaxp/src/java.xml/share/classes/javax/xml/catalog/CatalogReader.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -184,11 +184,14 @@ class CatalogReader extends DefaultHandler implements EntityResolver, URIResolve
if (resolve == null) {
resolve = catalog.getResolve().literal;
}
//override property settings with those from the catalog file
catalog.setResolve(resolve);
catalog.setPrefer(defer);
catalogEntry = new CatalogEntry(base, prefer, defer, resolve);
} else {
catalogEntry = new CatalogEntry(base, prefer);
}
catalog.setPrefer(prefer);
return;
} else {
inGroup = true;