Mercurial > jdk8-mips64-public > jaxws / file diff

     1.1 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/XmlSchemaGenerator.java	Thu Apr 04 19:05:24 2013 -0700
     1.2 +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/XmlSchemaGenerator.java	Tue Apr 09 14:51:13 2013 +0100
     1.3 @@ -1068,9 +1068,11 @@
     1.4                                      elemName = te.getElementName();
     1.5                                  }
     1.6  
     1.7 -                                Collection refs = propInfo.ref();
     1.8 -                                if ((refs != null) && (!refs.isEmpty()) && (elemName != null)) {
     1.9 -                                    ClassInfoImpl cImpl = (ClassInfoImpl)refs.iterator().next();
    1.10 +                                Collection<TypeInfo> refs = propInfo.ref();
    1.11 +                                TypeInfo ti;
    1.12 +                                if ((refs != null) && (!refs.isEmpty()) && (elemName != null)
    1.13 +                                        && ((ti = refs.iterator().next()) == null || ti instanceof ClassInfoImpl)) {
    1.14 +                                    ClassInfoImpl cImpl = (ClassInfoImpl)ti;
    1.15                                      if ((cImpl != null) && (cImpl.getElementName() != null)) {
    1.16                                          e.ref(new QName(cImpl.getElementName().getNamespaceURI(), tn.getLocalPart()));
    1.17                                      } else {