Mercurial > jdk8-mips64-public > jaxws / file comparison
comparison: src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXStreamConnector.java
src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXStreamConnector.java
- changeset 658
- 45676aaa9d47
- parent 514
- 29a761eaff0d
- child 760
- e530533619ec
equal
deleted
inserted
replaced
| 655:304ea93428f8 | 658:45676aaa9d47 |
|---|---|
| 68 } | 68 } |
| 69 | 69 |
| 70 // Quick hack until SJSXP fixes 6270116 | 70 // Quick hack until SJSXP fixes 6270116 |
| 71 boolean isZephyr = readerClass.getName().equals("com.sun.xml.internal.stream.XMLReaderImpl"); | 71 boolean isZephyr = readerClass.getName().equals("com.sun.xml.internal.stream.XMLReaderImpl"); |
| 72 if (getBoolProp(reader,"org.codehaus.stax2.internNames") && | 72 if (getBoolProp(reader,"org.codehaus.stax2.internNames") && |
| 73 getBoolProp(reader,"org.codehaus.stax2.internNsUris")) | 73 getBoolProp(reader,"org.codehaus.stax2.internNsUris")) |
| 74 ; // no need for interning | 74 ; // no need for interning |
| 75 else | 75 else |
| 76 if (isZephyr) | 76 if (isZephyr) |
| 77 ; // no need for interning | 77 ; // no need for interning |
| 78 else | 78 else |
| 217 | 217 |
| 218 // start namespace bindings | 218 // start namespace bindings |
| 219 int nsCount = staxStreamReader.getNamespaceCount(); | 219 int nsCount = staxStreamReader.getNamespaceCount(); |
| 220 for (int i = 0; i < nsCount; i++) { | 220 for (int i = 0; i < nsCount; i++) { |
| 221 visitor.startPrefixMapping( | 221 visitor.startPrefixMapping( |
| 222 fixNull(staxStreamReader.getNamespacePrefix(i)), | 222 fixNull(staxStreamReader.getNamespacePrefix(i)), |
| 223 fixNull(staxStreamReader.getNamespaceURI(i))); | 223 fixNull(staxStreamReader.getNamespaceURI(i))); |
| 224 } | 224 } |
| 225 | 225 |
| 226 // fire startElement | 226 // fire startElement |
| 227 tagName.uri = fixNull(staxStreamReader.getNamespaceURI()); | 227 tagName.uri = fixNull(staxStreamReader.getNamespaceURI()); |
| 228 tagName.local = staxStreamReader.getLocalName(); | 228 tagName.local = staxStreamReader.getLocalName(); |
| 308 }; | 308 }; |
| 309 | 309 |
| 310 protected void handleCharacters() throws XMLStreamException, SAXException { | 310 protected void handleCharacters() throws XMLStreamException, SAXException { |
| 311 if( predictor.expectText() ) | 311 if( predictor.expectText() ) |
| 312 buffer.append( | 312 buffer.append( |
| 313 staxStreamReader.getTextCharacters(), | 313 staxStreamReader.getTextCharacters(), |
| 314 staxStreamReader.getTextStart(), | 314 staxStreamReader.getTextStart(), |
| 315 staxStreamReader.getTextLength() ); | 315 staxStreamReader.getTextLength() ); |
| 316 } | 316 } |
| 317 | 317 |
| 318 private void processText( boolean ignorable ) throws SAXException { | 318 private void processText( boolean ignorable ) throws SAXException { |
| 319 if( predictor.expectText() && (!ignorable || !WhiteSpaceProcessor.isWhiteSpace(buffer))) { | 319 if( predictor.expectText() && (!ignorable || !WhiteSpaceProcessor.isWhiteSpace(buffer) || context.getCurrentState().isMixed())) { |
| 320 if(textReported) { | 320 if(textReported) { |
| 321 textReported = false; | 321 textReported = false; |
| 322 } else { | 322 } else { |
| 323 visitor.text(buffer); | 323 visitor.text(buffer); |
| 324 } | 324 } |
