Author: gnodet
Date: Wed Mar 7 06:25:01 2007
New Revision: 515583
URL: http://svn.apache.org/viewvc?view=rev&rev=515583
Log:
SM-870: StAXSourceTransformer should reuse the XMLStreamReader when available
Modified:
incubator/servicemix/branches/servicemix-3.1/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/jaxp/FragmentStreamReader.java
incubator/servicemix/branches/servicemix-3.1/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/jaxp/StAXSourceTransformer.java
incubator/servicemix/branches/servicemix-3.1/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/jaxp/StaxSource.java
Modified:
incubator/servicemix/branches/servicemix-3.1/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/jaxp/FragmentStreamReader.java
URL:
http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/jaxp/FragmentStreamReader.java?view=diff&rev=515583&r1=515582&r2=515583
==============================================================================
---
incubator/servicemix/branches/servicemix-3.1/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/jaxp/FragmentStreamReader.java
(original)
+++
incubator/servicemix/branches/servicemix-3.1/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/jaxp/FragmentStreamReader.java
Wed Mar 7 06:25:01 2007
@@ -56,6 +56,10 @@
return event;
}
+ public boolean hasNext() throws XMLStreamException {
+ return event != END_DOCUMENT;
+ }
+
public int next() throws XMLStreamException {
switch (state) {
case STATE_START_DOC:
Modified:
incubator/servicemix/branches/servicemix-3.1/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/jaxp/StAXSourceTransformer.java
URL:
http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/jaxp/StAXSourceTransformer.java?view=diff&rev=515583&r1=515582&r2=515583
==============================================================================
---
incubator/servicemix/branches/servicemix-3.1/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/jaxp/StAXSourceTransformer.java
(original)
+++
incubator/servicemix/branches/servicemix-3.1/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/jaxp/StAXSourceTransformer.java
Wed Mar 7 06:25:01 2007
@@ -63,6 +63,9 @@
}
public XMLStreamReader toXMLStreamReader(Source source) throws
XMLStreamException, TransformerException {
+ if (source instanceof StaxSource) {
+ return ((StaxSource) source).getXMLStreamReader();
+ }
// It seems that woodstox 2.9.3 throws some NPE in the servicemix-soap
// when using DOM, so use our own dom / stax parser
if (source instanceof DOMSource) {
Modified:
incubator/servicemix/branches/servicemix-3.1/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/jaxp/StaxSource.java
URL:
http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/jaxp/StaxSource.java?view=diff&rev=515583&r1=515582&r2=515583
==============================================================================
---
incubator/servicemix/branches/servicemix-3.1/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/jaxp/StaxSource.java
(original)
+++
incubator/servicemix/branches/servicemix-3.1/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/jaxp/StaxSource.java
Wed Mar 7 06:25:01 2007
@@ -53,6 +53,10 @@
return this;
}
+ public XMLStreamReader getXMLStreamReader() {
+ return streamReader;
+ }
+
protected void parse() throws SAXException {
try {
while (true) {
