diff -r 733e287c2d6f -r 121e938cb9c3 src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/ElementBeanInfoImpl.java --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/ElementBeanInfoImpl.java Tue Aug 26 14:30:24 2014 -0700 +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/ElementBeanInfoImpl.java Sun Aug 31 16:14:36 2014 +0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. + * 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 @@ -208,8 +208,8 @@ @Override public final void startElement(UnmarshallingContext.State state, TagName ea) throws SAXException { - state.loader = core; - state.intercepter = this; + state.setLoader(core); + state.setIntercepter(this); // TODO: make sure there aren't too many duplicate of this code // create the object to unmarshal @@ -231,21 +231,21 @@ fireBeforeUnmarshal(ElementBeanInfoImpl.this, child, state); context.recordOuterPeer(child); - UnmarshallingContext.State p = state.prev; - p.backup = p.target; - p.target = child; + UnmarshallingContext.State p = state.getPrev(); + p.setBackup(p.getTarget()); + p.setTarget(child); core.startElement(state,ea); } public Object intercept(UnmarshallingContext.State state, Object o) throws SAXException { - JAXBElement e = (JAXBElement)state.target; - state.target = state.backup; - state.backup = null; + JAXBElement e = (JAXBElement)state.getTarget(); + state.setTarget(state.getBackup()); + state.setBackup(null); - if (state.nil) { + if (state.isNil()) { e.setNil(true); - state.nil = false; + state.setNil(false); } if(o!=null)