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/20 14:42:48 UTC
svn commit: r1731401 - in /webservices/axiom/trunk:
aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomContainerSupport.aj
systests/old-tests/src/test/java/org/apache/axiom/om/impl/builder/StAXOMBuilderTest.java
Author: veithen
Date: Sat Feb 20 13:42:48 2016
New Revision: 1731401
URL: http://svn.apache.org/viewvc?rev=1731401&view=rev
Log:
OMContainer#close() shouldn't simply mark the container as complete.
Modified:
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomContainerSupport.aj
webservices/axiom/trunk/systests/old-tests/src/test/java/org/apache/axiom/om/impl/builder/StAXOMBuilderTest.java
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomContainerSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomContainerSupport.aj?rev=1731401&r1=1731400&r2=1731401&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomContainerSupport.aj (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomContainerSupport.aj Sat Feb 20 13:42:48 2016
@@ -421,7 +421,6 @@ public aspect AxiomContainerSupport {
if (build) {
this.build();
}
- setComplete(true);
if (builder != null) {
builder.close();
Modified: webservices/axiom/trunk/systests/old-tests/src/test/java/org/apache/axiom/om/impl/builder/StAXOMBuilderTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/systests/old-tests/src/test/java/org/apache/axiom/om/impl/builder/StAXOMBuilderTest.java?rev=1731401&r1=1731400&r2=1731401&view=diff
==============================================================================
--- webservices/axiom/trunk/systests/old-tests/src/test/java/org/apache/axiom/om/impl/builder/StAXOMBuilderTest.java (original)
+++ webservices/axiom/trunk/systests/old-tests/src/test/java/org/apache/axiom/om/impl/builder/StAXOMBuilderTest.java Sat Feb 20 13:42:48 2016
@@ -61,28 +61,6 @@ public class StAXOMBuilderTest extends A
assertTrue(childrenCount == 5);
}
- public void testClose1() throws Exception {
- rootElement = stAXOMBuilder.getDocumentElement();
- // get the first OMElement child
- OMNode omnode = rootElement.getFirstOMChild();
- while (omnode instanceof OMText) {
- omnode = omnode.getNextOMSibling();
- }
- // Close the element immediately
- OMElement omElement = (OMElement) omnode;
- omElement.close(false);
-
- Iterator children = ((OMElement) omnode).getChildren();
- int childrenCount = 0;
- while (children.hasNext()) {
- OMNode node = (OMNode) children.next();
- if (node instanceof OMElement)
- childrenCount++;
- }
-
- assertTrue(childrenCount == 0);
- }
-
public void testClose2() throws Exception {
rootElement = stAXOMBuilder.getDocumentElement();
// get the first OMElement child