Mercurial > jdk8-mips64-public > jaxws / changeset

     1.1 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StructureLoader.java	Tue Mar 29 23:01:47 2016 +0100
     1.2 +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StructureLoader.java	Fri Apr 01 19:03:40 2016 +0300
     1.3 @@ -231,22 +231,11 @@
     1.4      @Override
     1.5      public void childElement(UnmarshallingContext.State state, TagName arg) throws SAXException {
     1.6          ChildLoader child = childUnmarshallers.get(arg.uri,arg.local);
     1.7 -        if(child==null) {
     1.8 -            if ((beanInfo != null) && (beanInfo.getTypeNames() != null)) {
     1.9 -                Iterator typeNamesIt = beanInfo.getTypeNames().iterator();
    1.10 -                QName parentQName = null;
    1.11 -                if ((typeNamesIt != null) && (typeNamesIt.hasNext()) && (catchAll == null)) {
    1.12 -                    parentQName = (QName) typeNamesIt.next();
    1.13 -                    String parentUri = parentQName.getNamespaceURI();
    1.14 -                    child = childUnmarshallers.get(parentUri, arg.local);
    1.15 -                }
    1.16 -            }
    1.17 -            if (child == null) {
    1.18 -                child = catchAll;
    1.19 -                if(child==null) {
    1.20 -                    super.childElement(state,arg);
    1.21 -                    return;
    1.22 -                }
    1.23 +        if (child == null) {
    1.24 +            child = catchAll;
    1.25 +            if (child==null) {
    1.26 +                super.childElement(state,arg);
    1.27 +                return;
    1.28              }
    1.29          }
    1.30