1.1 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/ElementBeanInfoImpl.java Mon Sep 29 11:50:34 2014 -0700
1.2 +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/ElementBeanInfoImpl.java Sun Aug 31 16:14:36 2014 +0400
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 *
1.9 * This code is free software; you can redistribute it and/or modify it
1.10 @@ -208,8 +208,8 @@
1.11
1.12 @Override
1.13 public final void startElement(UnmarshallingContext.State state, TagName ea) throws SAXException {
1.14 - state.loader = core;
1.15 - state.intercepter = this;
1.16 + state.setLoader(core);
1.17 + state.setIntercepter(this);
1.18
1.19 // TODO: make sure there aren't too many duplicate of this code
1.20 // create the object to unmarshal
1.21 @@ -231,21 +231,21 @@
1.22 fireBeforeUnmarshal(ElementBeanInfoImpl.this, child, state);
1.23
1.24 context.recordOuterPeer(child);
1.25 - UnmarshallingContext.State p = state.prev;
1.26 - p.backup = p.target;
1.27 - p.target = child;
1.28 + UnmarshallingContext.State p = state.getPrev();
1.29 + p.setBackup(p.getTarget());
1.30 + p.setTarget(child);
1.31
1.32 core.startElement(state,ea);
1.33 }
1.34
1.35 public Object intercept(UnmarshallingContext.State state, Object o) throws SAXException {
1.36 - JAXBElement e = (JAXBElement)state.target;
1.37 - state.target = state.backup;
1.38 - state.backup = null;
1.39 + JAXBElement e = (JAXBElement)state.getTarget();
1.40 + state.setTarget(state.getBackup());
1.41 + state.setBackup(null);
1.42
1.43 - if (state.nil) {
1.44 + if (state.isNil()) {
1.45 e.setNil(true);
1.46 - state.nil = false;
1.47 + state.setNil(false);
1.48 }
1.49
1.50 if(o!=null)
