1.1 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Loader.java Mon Sep 29 11:50:34 2014 -0700
1.2 +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Loader.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 @@ -88,8 +88,8 @@
1.11 public void childElement(UnmarshallingContext.State state, TagName ea) throws SAXException {
1.12 // notify the error, then recover by ignoring the whole element.
1.13 reportUnexpectedChildElement(ea, true);
1.14 - state.loader = Discarder.INSTANCE;
1.15 - state.receiver = null;
1.16 + state.setLoader(Discarder.INSTANCE);
1.17 + state.setReceiver(null);
1.18 }
1.19
1.20 @SuppressWarnings({"StringEquality"})
1.21 @@ -195,10 +195,10 @@
1.22 UnmarshallingContext context = state.getContext();
1.23 Unmarshaller.Listener listener = context.parent.getListener();
1.24 if(beanInfo.hasBeforeUnmarshalMethod()) {
1.25 - beanInfo.invokeBeforeUnmarshalMethod(context.parent, child, state.prev.target);
1.26 + beanInfo.invokeBeforeUnmarshalMethod(context.parent, child, state.getPrev().getTarget());
1.27 }
1.28 if(listener!=null) {
1.29 - listener.beforeUnmarshal(child, state.prev.target);
1.30 + listener.beforeUnmarshal(child, state.getPrev().getTarget());
1.31 }
1.32 }
1.33 }
1.34 @@ -215,10 +215,10 @@
1.35 UnmarshallingContext context = state.getContext();
1.36 Unmarshaller.Listener listener = context.parent.getListener();
1.37 if(beanInfo.hasAfterUnmarshalMethod()) {
1.38 - beanInfo.invokeAfterUnmarshalMethod(context.parent, child, state.target);
1.39 + beanInfo.invokeAfterUnmarshalMethod(context.parent, child, state.getTarget());
1.40 }
1.41 if(listener!=null)
1.42 - listener.afterUnmarshal(child, state.target);
1.43 + listener.afterUnmarshal(child, state.getTarget());
1.44 }
1.45 }
1.46
