hg: jdk9/dev/jaxp: 8156845: Uri is getting incorrectly unwrapped

[huizhe.wang at oracle.com]

Changeset: 7b69a75155a2
Author:    joehw
Date:      2016-05-17 14:14 -0700
URL:       http://hg.openjdk.java.net/jdk9/dev/jaxp/rev/7b69a75155a2

8156845: Uri is getting incorrectly unwrapped
Reviewed-by: lancea

! src/java.xml/share/classes/javax/xml/catalog/CatalogResolverImpl.java
! src/java.xml/share/classes/javax/xml/catalog/CatalogUriResolverImpl.java
! src/java.xml/share/classes/javax/xml/catalog/GroupEntry.java
! src/java.xml/share/classes/javax/xml/catalog/Normalizer.java
! src/java.xml/share/classes/javax/xml/catalog/UriEntry.java
! src/java.xml/share/classes/javax/xml/catalog/Util.java
! test/javax/xml/jaxp/unittest/catalog/CatalogTest.java
+ test/javax/xml/jaxp/unittest/catalog/uri.xml