You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by ve...@apache.org on 2016/02/26 22:07:37 UTC
svn commit: r1732558 - in
/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom:
om/impl/common/builder/StAXOMBuilder.java
soap/impl/mixin/AxiomSOAPBodySupport.aj
Author: veithen
Date: Fri Feb 26 21:07:36 2016
New Revision: 1732558
URL: http://svn.apache.org/viewvc?rev=1732558&view=rev
Log:
Code cleanup.
Modified:
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/StAXOMBuilder.java
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAPBodySupport.aj
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/StAXOMBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/StAXOMBuilder.java?rev=1732558&r1=1732557&r2=1732558&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/StAXOMBuilder.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/StAXOMBuilder.java Fri Feb 26 21:07:36 2016
@@ -396,8 +396,4 @@ public class StAXOMBuilder extends Abstr
public final int lookahead() {
return helper.lookahead();
}
-
- public final AxiomContainer getTarget() {
- return builderHandler.context.target;
- }
}
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAPBodySupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAPBodySupport.aj?rev=1732558&r1=1732557&r2=1732558&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAPBodySupport.aj (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAPBodySupport.aj Fri Feb 26 21:07:36 2016
@@ -21,6 +21,7 @@ package org.apache.axiom.soap.impl.mixin
import javax.xml.stream.XMLStreamReader;
import org.apache.axiom.core.CoreChildNode;
+import org.apache.axiom.core.InputContext;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMException;
import org.apache.axiom.om.OMNamespace;
@@ -36,8 +37,8 @@ public aspect AxiomSOAPBodySupport {
}
private boolean AxiomSOAPBody.hasLookahead() {
- StAXOMBuilder builder = (StAXOMBuilder)coreGetBuilder();
- if (builder != null && !builder.isCompleted() && builder.getTarget() == this) {
+ InputContext context = coreGetInputContext();
+ if (context != null) {
CoreChildNode child = coreGetFirstChildIfAvailable();
while (child != null) {
if (child instanceof OMElement) {
@@ -45,12 +46,13 @@ public aspect AxiomSOAPBodySupport {
}
child = child.coreGetNextSiblingIfAvailable();
}
+ StAXOMBuilder builder = (StAXOMBuilder)context.getBuilder();
do {
if (builder.lookahead() == XMLStreamReader.START_ELEMENT) {
return true;
}
builder.next();
- } while (builder.getTarget() == this);
+ } while (coreGetInputContext() != null);
}
return false;
}