diff -r e126d8eca69b -r b0c2840e2513 src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/TypeInfo.java --- a/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/TypeInfo.java Thu Oct 31 12:36:20 2013 -0700 +++ b/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/TypeInfo.java Fri Nov 22 21:11:19 2013 +0100 @@ -119,12 +119,11 @@ // if we are to reinstitute this check, check JAXB annotations only // assert annotations.length==0; // not designed to work with adapters. Type t = (genericType != null)? genericType : type; - Type base = Navigator.REFLECTION.getBaseClass(t, Collection.class); + Type base = Utils.REFLECTION_NAVIGATOR.getBaseClass(t, Collection.class); if(base==null) return this; // not a collection - return new TypeInfo(tagName, - Navigator.REFLECTION.getTypeArgument(base,0)); + return new TypeInfo(tagName, Utils.REFLECTION_NAVIGATOR.getTypeArgument(base,0)); } public Map properties() { @@ -188,9 +187,9 @@ } // if (type instanceof Class && java.util.Collection.class.isAssignableFrom((Class)type)) { Type t = (genericType != null)? genericType : type; - Type base = Navigator.REFLECTION.getBaseClass(t, Collection.class); + Type base = Utils.REFLECTION_NAVIGATOR.getBaseClass(t, Collection.class); if ( base != null) { - return new TypeInfo(tagName, Navigator.REFLECTION.getTypeArgument(base,0), annotations); + return new TypeInfo(tagName, Utils.REFLECTION_NAVIGATOR.getTypeArgument(base,0), annotations); } return null; }