1.1 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXStreamConnector.java Tue Oct 07 08:49:42 2014 -0700
1.2 +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXStreamConnector.java Wed Oct 01 19:30:37 2014 +0400
1.3 @@ -70,7 +70,7 @@
1.4 // Quick hack until SJSXP fixes 6270116
1.5 boolean isZephyr = readerClass.getName().equals("com.sun.xml.internal.stream.XMLReaderImpl");
1.6 if (getBoolProp(reader,"org.codehaus.stax2.internNames") &&
1.7 - getBoolProp(reader,"org.codehaus.stax2.internNsUris"))
1.8 + getBoolProp(reader,"org.codehaus.stax2.internNsUris"))
1.9 ; // no need for interning
1.10 else
1.11 if (isZephyr)
1.12 @@ -219,8 +219,8 @@
1.13 int nsCount = staxStreamReader.getNamespaceCount();
1.14 for (int i = 0; i < nsCount; i++) {
1.15 visitor.startPrefixMapping(
1.16 - fixNull(staxStreamReader.getNamespacePrefix(i)),
1.17 - fixNull(staxStreamReader.getNamespaceURI(i)));
1.18 + fixNull(staxStreamReader.getNamespacePrefix(i)),
1.19 + fixNull(staxStreamReader.getNamespaceURI(i)));
1.20 }
1.21
1.22 // fire startElement
1.23 @@ -310,13 +310,13 @@
1.24 protected void handleCharacters() throws XMLStreamException, SAXException {
1.25 if( predictor.expectText() )
1.26 buffer.append(
1.27 - staxStreamReader.getTextCharacters(),
1.28 - staxStreamReader.getTextStart(),
1.29 - staxStreamReader.getTextLength() );
1.30 + staxStreamReader.getTextCharacters(),
1.31 + staxStreamReader.getTextStart(),
1.32 + staxStreamReader.getTextLength() );
1.33 }
1.34
1.35 private void processText( boolean ignorable ) throws SAXException {
1.36 - if( predictor.expectText() && (!ignorable || !WhiteSpaceProcessor.isWhiteSpace(buffer))) {
1.37 + if( predictor.expectText() && (!ignorable || !WhiteSpaceProcessor.isWhiteSpace(buffer) || context.getCurrentState().isMixed())) {
1.38 if(textReported) {
1.39 textReported = false;
1.40 } else {
