hg: jdk9/sandbox/jaxp: 8146237: PREFER from Features API taking precedence over catalog file

[chris.hegarty at oracle.com]

Changeset: 4786b4c1ba69
Author:    joehw
Date:      2016-02-17 16:32 -0800
URL:       http://hg.openjdk.java.net/jdk9/sandbox/jaxp/rev/4786b4c1ba69

8146237: PREFER from Features API taking precedence over catalog file
Reviewed-by: lancea

! src/java.xml/share/classes/javax/xml/catalog/CatalogReader.java
! test/javax/xml/jaxp/unittest/catalog/CatalogTest.java
+ test/javax/xml/jaxp/unittest/catalog/JDK8146237_catalog.xml