hg: jdk9/jdk9/jaxp: 2 new changesets

[lana.steuck at oracle.com]

Changeset: bfd3029fa3dd
Author:    joehw
Date:      2016-04-06 14:31 -0700
URL:       http://hg.openjdk.java.net/jdk9/jdk9/jaxp/rev/bfd3029fa3dd

8150969: DEFER from Features API is taking precedence over defer preference in 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/bad_cat.xml
+ test/javax/xml/jaxp/unittest/catalog/defer_del_false.xml
+ test/javax/xml/jaxp/unittest/catalog/defer_false_2.xml

Changeset: 147114dd0641
Author:    lana
Date:      2016-04-07 11:03 -0700
URL:       http://hg.openjdk.java.net/jdk9/jdk9/jaxp/rev/147114dd0641

Merge