You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2016/03/06 22:31:34 UTC
svn commit: r1733844 - in
/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/impl:
BlockImpl.java XMLSpineImpl.java
Author: veithen
Date: Sun Mar 6 21:31:34 2016
New Revision: 1733844
URL: http://svn.apache.org/viewvc?rev=1733844&view=rev
Log:
Code simplification: if the builder of an element is complete, then getXMLStreamReaderWithoutCaching and getXMLStreamReader are equivalent.
Modified:
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/impl/BlockImpl.java
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/impl/XMLSpineImpl.java
Modified: axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/impl/BlockImpl.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/impl/BlockImpl.java?rev=1733844&r1=1733843&r2=1733844&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/impl/BlockImpl.java (original)
+++ axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/impl/BlockImpl.java Sun Mar 6 21:31:34 2016
@@ -232,15 +232,9 @@ public abstract class BlockImpl implemen
Messages.getMessage("BlockImplErr1", this.getClass().getName()));
}
if (omElement != null) {
+ newReader = omElement.getXMLStreamReader(!consume);
if (consume) {
- if (omElement.getBuilder() != null && !omElement.getBuilder().isCompleted()) {
- newReader = omElement.getXMLStreamReaderWithoutCaching();
- } else {
- newReader = omElement.getXMLStreamReader();
- }
omElement = null;
- } else {
- newReader = omElement.getXMLStreamReader();
}
} else if (busObject != null) {
// Getting the reader does not destroy the BusinessObject
@@ -472,14 +466,8 @@ public abstract class BlockImpl implemen
* @throws WebServiceException
*/
protected Object _getBOFromOM(OMElement omElement, Object busContext)
- throws XMLStreamException, WebServiceException {
- XMLStreamReader reader;
- if (omElement.getBuilder() != null && !omElement.getBuilder().isCompleted()) {
- reader = omElement.getXMLStreamReaderWithoutCaching();
- } else {
- reader = omElement.getXMLStreamReader();
- }
- return _getBOFromReader(reader, busContext);
+ throws XMLStreamException, WebServiceException {
+ return _getBOFromReader(omElement.getXMLStreamReader(false), busContext);
}
/**
Modified: axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/impl/XMLSpineImpl.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/impl/XMLSpineImpl.java?rev=1733844&r1=1733843&r2=1733844&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/impl/XMLSpineImpl.java (original)
+++ axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/impl/XMLSpineImpl.java Sun Mar 6 21:31:34 2016
@@ -183,15 +183,7 @@ class XMLSpineImpl implements XMLSpine {
}
public XMLStreamReader getXMLStreamReader(boolean consume) throws WebServiceException {
- if (consume) {
- if (root.getBuilder() != null && !root.getBuilder().isCompleted()) {
- return root.getXMLStreamReaderWithoutCaching();
- } else {
- return root.getXMLStreamReader();
- }
- } else {
- return root.getXMLStreamReader();
- }
+ return root.getXMLStreamReader(!consume);
}
/* (non-Javadoc)