src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StructureLoader.java

*** 1,7 ****
  /*
!  * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  /*
!  * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
*** 170,180 ****
          if(child == null)
              child = context.createInstance(beanInfo);
  
          context.recordInnerPeer(child);
  
!         state.target = child;
  
          fireBeforeUnmarshal(beanInfo, child, state);
  
  
          context.startScope(frameSize);
--- 170,180 ----
          if(child == null)
              child = context.createInstance(beanInfo);
  
          context.recordInnerPeer(child);
  
!         state.setTarget(child);
  
          fireBeforeUnmarshal(beanInfo, child, state);
  
  
          context.startScope(frameSize);
*** 195,205 ****
                          xacc.parse(child,avalue);
                      } else if (attCatchAll!=null) {
                          String qname = atts.getQName(i);
                          if(atts.getURI(i).equals(WellKnownNamespace.XML_SCHEMA_INSTANCE))
                              continue;   // xsi:* attributes are meant to be processed by us, not by user apps.
!                         Object o = state.target;
                          Map<QName,String> map = attCatchAll.get(o);
                          if(map==null) {
                              // TODO: use  ClassFactory.inferImplClass(sig,knownImplClasses)
  
                              // if null, create a new map.
--- 195,205 ----
                          xacc.parse(child,avalue);
                      } else if (attCatchAll!=null) {
                          String qname = atts.getQName(i);
                          if(atts.getURI(i).equals(WellKnownNamespace.XML_SCHEMA_INSTANCE))
                              continue;   // xsi:* attributes are meant to be processed by us, not by user apps.
!                         Object o = state.getTarget();
                          Map<QName,String> map = attCatchAll.get(o);
                          if(map==null) {
                              // TODO: use  ClassFactory.inferImplClass(sig,knownImplClasses)
  
                              // if null, create a new map.
*** 248,259 ****
                      return;
                  }
              }
          }
  
!         state.loader = child.loader;
!         state.receiver = child.receiver;
      }
  
      @Override
      public Collection<QName> getExpectedChildElements() {
          return childUnmarshallers.keySet();
--- 248,259 ----
                      return;
                  }
              }
          }
  
!         state.setLoader(child.loader);
!         state.setReceiver(child.receiver);
      }
  
      @Override
      public Collection<QName> getExpectedChildElements() {
          return childUnmarshallers.keySet();
*** 271,281 ****
      }
  
      @Override
      public void leaveElement(UnmarshallingContext.State state, TagName ea) throws SAXException {
          state.getContext().endScope(frameSize);
!         fireAfterUnmarshal(beanInfo, state.target, state.prev);
      }
  
      private static final QNameMap<TransducedAccessor> EMPTY = new QNameMap<TransducedAccessor>();
  
      public JaxBeanInfo getBeanInfo() {
--- 271,281 ----
      }
  
      @Override
      public void leaveElement(UnmarshallingContext.State state, TagName ea) throws SAXException {
          state.getContext().endScope(frameSize);
!         fireAfterUnmarshal(beanInfo, state.getTarget(), state.getPrev());
      }
  
      private static final QNameMap<TransducedAccessor> EMPTY = new QNameMap<TransducedAccessor>();
  
      public JaxBeanInfo getBeanInfo() {