Mercurial > hg > openjdk > jdk8u > jaxws

changeset 1159:4e12f131bb0d jdk8u102-b03

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author asaha
date Mon, 11 Apr 2016 14:59:37 -0700
parents b949dc73142a (current diff) 0ed05886ec9d (diff)
children 5b1d73ea0eb6
files .hgtags
diffstat 2 files changed, 6 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Tue Apr 05 10:13:26 2016 -0700
+++ b/.hgtags	Mon Apr 11 14:59:37 2016 -0700
@@ -581,3 +581,4 @@
 a0c077b39c7a331bda9764a173a2b02d0725f28f jdk8u102-b00
 a0c077b39c7a331bda9764a173a2b02d0725f28f jdk8u82-b00
 c0ad0fa38df0841eaaf81ab40e8b07b42372c5d5 jdk8u102-b01
+face9bd6bac2d43d4c423be4fe733689794c2f08 jdk8u102-b02
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StructureLoader.java	Tue Apr 05 10:13:26 2016 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StructureLoader.java	Mon Apr 11 14:59:37 2016 -0700
@@ -231,22 +231,11 @@
     @Override
     public void childElement(UnmarshallingContext.State state, TagName arg) throws SAXException {
         ChildLoader child = childUnmarshallers.get(arg.uri,arg.local);
-        if(child==null) {
-            if ((beanInfo != null) && (beanInfo.getTypeNames() != null)) {
-                Iterator typeNamesIt = beanInfo.getTypeNames().iterator();
-                QName parentQName = null;
-                if ((typeNamesIt != null) && (typeNamesIt.hasNext()) && (catchAll == null)) {
-                    parentQName = (QName) typeNamesIt.next();
-                    String parentUri = parentQName.getNamespaceURI();
-                    child = childUnmarshallers.get(parentUri, arg.local);
-                }
-            }
-            if (child == null) {
-                child = catchAll;
-                if(child==null) {
-                    super.childElement(state,arg);
-                    return;
-                }
+        if (child == null) {
+            child = catchAll;
+            if (child==null) {
+                super.childElement(state,arg);
+                return;
             }
         }