1.1 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LeafPropertyXsiLoader.java Tue Aug 26 14:30:24 2014 -0700 1.2 +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LeafPropertyXsiLoader.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 @@ -55,9 +55,9 @@ 1.11 1.12 @Override 1.13 public void startElement(UnmarshallingContext.State state, TagName ea) throws SAXException { 1.14 - state.loader = selectLoader(state, ea); 1.15 - 1.16 - state.loader.startElement(state, ea); 1.17 + final Loader loader = selectLoader(state, ea); 1.18 + state.setLoader(loader); 1.19 + loader.startElement(state, ea); 1.20 } 1.21 1.22 protected Loader selectLoader(UnmarshallingContext.State state, TagName ea) throws SAXException {