Mon, 11 Apr 2016 14:59:37 -0700
Merge
.hgtags | file | annotate | diff | comparison | revisions |
1.1 --- a/.hgtags Tue Apr 05 10:13:26 2016 -0700 1.2 +++ b/.hgtags Mon Apr 11 14:59:37 2016 -0700 1.3 @@ -581,3 +581,4 @@ 1.4 a0c077b39c7a331bda9764a173a2b02d0725f28f jdk8u102-b00 1.5 a0c077b39c7a331bda9764a173a2b02d0725f28f jdk8u82-b00 1.6 c0ad0fa38df0841eaaf81ab40e8b07b42372c5d5 jdk8u102-b01 1.7 +face9bd6bac2d43d4c423be4fe733689794c2f08 jdk8u102-b02
2.1 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StructureLoader.java Tue Apr 05 10:13:26 2016 -0700 2.2 +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StructureLoader.java Mon Apr 11 14:59:37 2016 -0700 2.3 @@ -231,22 +231,11 @@ 2.4 @Override 2.5 public void childElement(UnmarshallingContext.State state, TagName arg) throws SAXException { 2.6 ChildLoader child = childUnmarshallers.get(arg.uri,arg.local); 2.7 - if(child==null) { 2.8 - if ((beanInfo != null) && (beanInfo.getTypeNames() != null)) { 2.9 - Iterator typeNamesIt = beanInfo.getTypeNames().iterator(); 2.10 - QName parentQName = null; 2.11 - if ((typeNamesIt != null) && (typeNamesIt.hasNext()) && (catchAll == null)) { 2.12 - parentQName = (QName) typeNamesIt.next(); 2.13 - String parentUri = parentQName.getNamespaceURI(); 2.14 - child = childUnmarshallers.get(parentUri, arg.local); 2.15 - } 2.16 - } 2.17 - if (child == null) { 2.18 - child = catchAll; 2.19 - if(child==null) { 2.20 - super.childElement(state,arg); 2.21 - return; 2.22 - } 2.23 + if (child == null) { 2.24 + child = catchAll; 2.25 + if (child==null) { 2.26 + super.childElement(state,arg); 2.27 + return; 2.28 } 2.29 } 2.30